Skip to content
Snippets Groups Projects
Commit 625bde16 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Fix docker image

parent 433e40b3
No related branches found
No related tags found
2 merge requests!1068Fix docker image,!1045Introduce Vuetify and GraphQL
Pipeline #82005 passed
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; \
......
......@@ -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}'],
}),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment