Skip to content

Updates to support v2 release #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Updates to support v2 release #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ ARG PLANKA_RELEASE

RUN \
echo "**** install packages ****" && \
apk add --no-cache \
apk add --no-cache --virtual=build-dependencies \
build-base \
giflib \
libgsf \
nodejs \
vips && \
apk add --no-cache --virtual=build-dependencies \
build-base \
npm \
py3-setuptools \
python3-dev && \
python3-dev \
vips && \
echo "**** install planka ****" && \
if [ -z ${PLANKA_RELEASE+x} ]; then \
PLANKA_RELEASE=$(curl -s https://api.github.com/repos/plankanban/planka/releases/latest \
Expand All @@ -30,12 +29,9 @@ RUN \
/tmp/planka.tar.gz -C \
/build --strip-components=1 && \
cd /build/server && \
npm install pnpm@9 --global && \
pnpm import && \
pnpm install --prod && \
npm install --omit=dev && \
cd /build/client && \
pnpm import && \
pnpm install --prod && \
npm install --omit=dev && \
DISABLE_ESLINT_PLUGIN=true npm run build && \
echo "**** cleanup ****" && \
apk del --purge \
Expand All @@ -56,8 +52,8 @@ LABEL maintainer="thespad"

COPY --from=buildstage /build/server/ /app
COPY --from=buildstage /build/server/.env.sample /app/.env
COPY --from=buildstage /build/client/build /app/public/
COPY --from=buildstage /build/client/build/index.html /app/views/index.ejs
COPY --from=buildstage /build/client/dist /app/public/
COPY --from=buildstage /build/client/dist/index.html /app/views

RUN \
apk add --no-cache \
Expand All @@ -66,8 +62,8 @@ RUN \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** create symlinks ****" && \
/bin/bash -c \
'dst=(user-avatars project-background-images attachments logs); \
src=(public/user-avatars public/project-background-images private/attachments logs); \
'dst=(favicons user-avatars background-images attachments logs); \
src=(public/favicons public/user-avatars public/background-images private/attachments logs); \
for i in "${!src[@]}"; do rm -rf /app/"${src[i]}" && ln -s /config/"${dst[i]}" /app/"${src[i]}"; done'

# copy local files
Expand Down
32 changes: 14 additions & 18 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ ARG PLANKA_RELEASE

RUN \
echo "**** install packages ****" && \
apk add --no-cache \
apk add --no-cache --virtual=build-dependencies \
build-base \
giflib \
libgsf \
nodejs \
vips && \
apk add --no-cache --virtual=build-dependencies \
build-base \
npm \
py3-setuptools \
python3-dev && \
python3-dev \
vips && \
echo "**** install planka ****" && \
if [ -z ${PLANKA_RELEASE+x} ]; then \
PLANKA_RELEASE=$(curl -s https://api.github.com/repos/plankanban/planka/releases/latest \
Expand All @@ -30,12 +29,9 @@ RUN \
/tmp/planka.tar.gz -C \
/build --strip-components=1 && \
cd /build/server && \
npm install pnpm@9 --global && \
pnpm import && \
pnpm install --prod && \
npm install --omit=dev && \
cd /build/client && \
pnpm import && \
pnpm install --prod && \
npm install --omit=dev && \
DISABLE_ESLINT_PLUGIN=true npm run build && \
echo "**** cleanup ****" && \
apk del --purge \
Expand All @@ -56,19 +52,19 @@ LABEL maintainer="thespad"

COPY --from=buildstage /build/server/ /app
COPY --from=buildstage /build/server/.env.sample /app/.env
COPY --from=buildstage /build/client/build /app/public/
COPY --from=buildstage /build/client/build/index.html /app/views/index.ejs
COPY --from=buildstage /build/client/dist /app/public/
COPY --from=buildstage /build/client/dist/index.html /app/views

RUN \
apk add --no-cache \
nodejs \
postgresql16-client && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** create symlinks ****" && \
/bin/bash -c \
'dst=(user-avatars project-background-images attachments logs); \
src=(public/user-avatars public/project-background-images private/attachments logs); \
for i in "${!src[@]}"; do rm -rf /app/"${src[i]}" && ln -s /config/"${dst[i]}" /app/"${src[i]}"; done'
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** create symlinks ****" && \
/bin/bash -c \
'dst=(favicons user-avatars background-images attachments logs); \
src=(public/favicons public/user-avatars public/background-images private/attachments logs); \
for i in "${!src[@]}"; do rm -rf /app/"${src[i]}" && ln -s /config/"${dst[i]}" /app/"${src[i]}"; done'

# copy local files
COPY root/ /
Expand Down
2 changes: 1 addition & 1 deletion root/etc/s6-overlay/s6-rc.d/init-planka-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

cd /app || exit 1

mkdir -p /config/logs
mkdir -p /config/{favicons,user-avatars,background-images,attachments,logs}

if [[ -n ${DATABASE_URL} ]]; then
DB_HOST=$(awk -F '@|:|/' '{print $6}' <<<"${DATABASE_URL}")
Expand Down