Skip to content
Snippets Groups Projects

Fix docker image

Merged Tom Teichler requested to merge test-deployment into feature/vuejs
1 file
+ 9
6
Compare changes
  • Side-by-side
  • Inline
+ 9
6
@@ -2,7 +2,7 @@ FROM debian:bullseye-slim AS core
# Build arguments
ARG EXTRAS="ldap,s3,sentry"
ARG APP_VERSION=""
ARG APP_VERSION="==2.10.1.dev0+20220801181456.7ba74939"
# Configure Python to be nice inside Docker and pip to stfu
ENV PYTHONUNBUFFERED 1
@@ -44,7 +44,8 @@ RUN apt-get -y update && \
python3-pip \
uwsgi \
uwsgi-plugin-python3 \
yarnpkg
yarnpkg \
npm
# Install extra dependencies
RUN case ",$EXTRAS," in \
@@ -67,14 +68,16 @@ RUN set -e; \
EXPOSE 8000
VOLUME ${ALEKSIS_media__root} ${ALEKSIS_backup__location}
COPY docker-startup.sh /usr/local/bin/aleksis-docker-startup
COPY package.json /
COPY webpack.config.js /
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/usr/local/bin/aleksis-docker-startup"]
# Install assets
FROM core as assets
RUN eatmydata aleksis-admin yarn install; \
RUN eatmydata yarnpkg install; \
eatmydata aleksis-admin write_webpack_entrypoints; \
yarn run webpack; \
eatmydata yarnpkg run webpack; \
eatmydata aleksis-admin collectstatic --no-input; \
rm -rf /usr/local/share/.cache
@@ -120,9 +123,9 @@ ONBUILD RUN set -e; \
if [ -n "$APPS" ]; then \
eatmydata pip install $APPS; \
fi; \
eatmydata aleksis-admin yarn install; \
eatmydata yarnpkg install; \
eatmydata aleksis-admin write_webpack_entrypoints; \
yarn run webpack; \
yarnpkg run webpack; \
eatmydata aleksis-admin collectstatic --no-input; \
rm -rf /usr/local/share/.cache; \
eatmydata apt-get remove --purge -y yarnpkg $BUILD_DEPS; \
Loading