Merge branch 'test-deployment' into 'feature/vuejs'

Fix docker image

See merge request !1068

Dockerfile

-FROM debian:bullseye-slim AS core
+FROM debian:bookworm-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
@@ -67,14 +67,20 @@ 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 /usr/local/lib/python3.10/dist-packages/package.json
+COPY webpack.config.js /usr/local/lib/python3.10/dist-packages/webpack.config.js
+COPY package.json /var/lib/aleksis/
+COPY webpack.config.js /var/lib/aleksis/
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["/usr/local/bin/aleksis-docker-startup"]
 
 # Install assets
 FROM core as assets
-RUN eatmydata aleksis-admin yarn install; \
+WORKDIR /usr/local/lib/python3.10/dist-packages
+RUN eatmydata yarnpkg install; \
     eatmydata aleksis-admin write_webpack_entrypoints; \
-    yarn run webpack; \
+    cp /usr/local/lib/python3.10/dist-packages/webpack-entrypoints.json /var/lib/aleksis/; \
+    yarnpkg run webpack; \
     eatmydata aleksis-admin collectstatic --no-input; \
     rm -rf /usr/local/share/.cache
 
@@ -120,9 +126,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; \

webpack.config.js

@@ -3,7 +3,6 @@ const path = require('path');
 const webpack = require('webpack');
 const BundleTracker = require('webpack-bundle-tracker');
 const { VueLoaderPlugin } = require('vue-loader');
-const ESLintPlugin = require('eslint-webpack-plugin');
 const StyleLintPlugin = require('stylelint-webpack-plugin');
 
 module.exports = {
@@ -17,9 +16,6 @@ module.exports = {
   plugins: [
     new BundleTracker({filename: './webpack-stats.json'}),
     new VueLoaderPlugin(),
-    new ESLintPlugin({
-      extensions: ["js", "vue"],
-    }),
     new StyleLintPlugin({
       files: ['assets/**/*.{vue,htm,html,css,sss,less,scss,sass}'],
     }),