From 625bde16cdfd068f556bd6e81faf187008ab3cbe Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 1 Aug 2022 18:25:23 +0200
Subject: [PATCH] Fix docker image
---
Dockerfile | 15 +++++++++------
webpack.config.js | 4 ----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 222a496b8..a457f2c36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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,17 @@ 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
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; \
+ 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; \
diff --git a/webpack.config.js b/webpack.config.js
index afdbda23a..ceee3fb45 100644
--- a/webpack.config.js
+++ b/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}'],
}),
--
GitLab