Git-Mirrors/mat2-web
1
0
Fork 0
mirror of https://0xacab.org/jvoisin/mat2-web.git synced 2025-02-24 00:59:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

build css in an intermediate container

Browse Source
This commit is contained in:
Jfriedli 2021-03-21 15:31:51 +01:00
parent 9b8a65e10c
commit 8bb860a865
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@ -2,6 +2,4 @@ uploads
node_modules node_modules
static/dist static/dist
static/.webassets-cache static/.webassets-cache
*.js
*.json
*.md *.md

2
.gitlab-ci.yml
View File

@ -36,8 +36,6 @@ tests:debian:
stage: test stage: test
before_script: before_script:
- apt update - apt update
- apt install nodejs npm
- npm install --global postcss
script: script:
- apt-get -qqy update - apt-get -qqy update
- apt-get -qqy install --no-install-recommends mat2 python3-flask python3-coverage python3-pip python3-setuptools - apt-get -qqy install --no-install-recommends mat2 python3-flask python3-coverage python3-pip python3-setuptools

12
Dockerfile.production
View File

@ -1,5 +1,11 @@
# Build the needed css files in an intermediate container
FROM node:14-buster AS static_web_assets_build
WORKDIR /var/www/mat2-web
COPY . /var/www/mat2-web
RUN npm install \
&& npm install --global postcss \
&& npm run build:css
# https://github.com/nginxinc/docker-nginx-unprivileged/blob/master/stable/buster/Dockerfile # https://github.com/nginxinc/docker-nginx-unprivileged/blob/master/stable/buster/Dockerfile
From debian:buster-slim From debian:buster-slim
LABEL maintainer="Mat-Web Co-Maintainer <jan.friedli@immerda.ch>" LABEL maintainer="Mat-Web Co-Maintainer <jan.friedli@immerda.ch>"
@ -7,6 +13,7 @@ LABEL maintainer="Mat-Web Co-Maintainer <jan.friedli@immerda.ch>"
WORKDIR /var/www/mat2-web WORKDIR /var/www/mat2-web
COPY . /var/www/mat2-web COPY . /var/www/mat2-web
COPY --from=static_web_assets_build /var/www/mat2-web/static/dist ./static/dist
ENV MAT2_WEB_DOWNLOAD_FOLDER /app/upload ENV MAT2_WEB_DOWNLOAD_FOLDER /app/upload
@ -38,6 +45,9 @@ RUN set -x \
&& mkdir -p /var/cache/nginx \ && mkdir -p /var/cache/nginx \
&& chown -R 101:0 /var/cache/nginx \ && chown -R 101:0 /var/cache/nginx \
&& chmod -R g+w /var/cache/nginx \ && chmod -R g+w /var/cache/nginx \
&& mkdir -p /var/www/mat2-web/static/.webassets-cache \
&& chown -R 101:0 /var/www/mat2-web/static/.webassets-cache \
&& chmod -R g+w /var/www/mat2-web/static/.webassets-cache \
&& ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \ && ln -sf /dev/stderr /var/log/nginx/error.log \
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/* \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/* \

2
main.py
View File

@ -23,7 +23,7 @@ def create_app(test_config=None):
# Non JS Frontend # Non JS Frontend
assets = Environment(app) assets = Environment(app)
css = Bundle("src/main.css", output="dist/main.css", filters="postcss") css = Bundle("src/main.css", output="dist/main.css")
assets.register("css", css) assets.register("css", css)
css.build() css.build()
app.jinja_loader = jinja2.ChoiceLoader([ # type: ignore app.jinja_loader = jinja2.ChoiceLoader([ # type: ignore