stop being stupid, fix file perms by not using add with http

This commit is contained in:
Jan Koppe 2020-05-02 00:37:43 +02:00
parent 95982a7815
commit 64758083b3
Signed by: thunfisch
GPG Key ID: BE935B0735A2129B
1 changed files with 5 additions and 5 deletions

View File

@ -21,16 +21,16 @@ RUN pip install -r requirements.txt
ADD ./docker/nginx.conf /etc/nginx/nginx.conf ADD ./docker/nginx.conf /etc/nginx/nginx.conf
ADD ./docker/supervisord.conf /etc/supervisord.conf ADD ./docker/supervisord.conf /etc/supervisord.conf
# add user; add nginx to portier group for static file access # add user
RUN addgroup -S portier && adduser -S portier -G portier && adduser nginx portier RUN addgroup -S portier && adduser -S portier -G portier
# add code # add code
ADD --chown=portier:portier . /app ADD --chown=portier:portier . /app
# add static external libraries for frontend # add static external libraries for frontend
ADD --chown=portier:portier http://code.jquery.com/jquery-${JQUERY_VERSION}.min.js /app/static/js/jquery.min.js RUN wget http://code.jquery.com/jquery-${JQUERY_VERSION}.min.js -O /app/static/js/jquery.min.js \
ADD --chown=portier:portier https://stackpath.bootstrapcdn.com/bootstrap/${BOOTSTRAP_VERSION}/js/bootstrap.bundle.min.js /app/static/js/bootstrap.bundle.min.js && wget https://stackpath.bootstrapcdn.com/bootstrap/${BOOTSTRAP_VERSION}/js/bootstrap.bundle.min.js -O /app/static/js/bootstrap.bundle.min.js \
RUN mkdir -p /tmp/inter /app/static/fonts \ && mkdir -p /tmp/inter /app/static/fonts \
&& cd /tmp/inter && wget https://github.com/rsms/inter/releases/download/v${INTER_VERSION}/Inter-${INTER_VERSION}.zip \ && cd /tmp/inter && wget https://github.com/rsms/inter/releases/download/v${INTER_VERSION}/Inter-${INTER_VERSION}.zip \
&& unzip Inter-${INTER_VERSION}.zip && mv /tmp/inter/Inter\ Web/* /app/static/fonts/ \ && unzip Inter-${INTER_VERSION}.zip && mv /tmp/inter/Inter\ Web/* /app/static/fonts/ \
&& cd - \ && cd - \