From 3fe92f03d6350954572bf291b7a1051cc05d4427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= Date: Thu, 24 Sep 2020 00:10:46 +0800 Subject: [PATCH] Changed the compiler source --- Dockerfile | 7 ++++--- k8s.yaml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 085bc33..eae9b36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,16 @@ FROM alpine:latest WORKDIR /app RUN mkdir -p /opt/utils -RUN wget -O /opt/utils/closure.jar "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20200830/closure-compiler-v20200830.jar" -RUN wget -O /opt/utils/yuicompressor.jar "https://github.com/yui/yuicompressor/releases/download/v2.4.8/yuicompressor-2.4.8.jar" +RUN wget -O /opt/utils/closure.jar "https://github.com/tgckpg/BotanJS/releases/download/compressors/closure.jar" +RUN wget -O /opt/utils/yuicompressor.jar "https://github.com/tgckpg/BotanJS/releases/download/compressors/yuicompressor.jar" -RUN apk add --update bash python3 uwsgi uwsgi-python; python3 -m ensurepip +RUN apk add --update bash python3 uwsgi uwsgi-python openjdk11-jre-headless; python3 -m ensurepip RUN echo "www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin" >> /etc/passwd; echo "www-data:x:33:" >> /etc/group RUN chown www-data:www-data . -R RUN pip3 install Flask redis compressinja Celery + USER www-data EXPOSE 5000 diff --git a/k8s.yaml b/k8s.yaml index c37ecad..e20e297 100644 --- a/k8s.yaml +++ b/k8s.yaml @@ -19,7 +19,7 @@ spec: path: /srv/astrostorage containers: - name: web - image: 192.168.80.4:32000/sites/astrojs:b00027 + image: 192.168.80.4:32000/sites/astrojs:b00031 volumeMounts: - mountPath: "/app/cache" name: astrojs-cache @@ -33,7 +33,7 @@ spec: - name: redis image: redis:6.0.8-alpine - name: compiler - image: 192.168.80.4:32000/sites/astrojs:b00027 + image: 192.168.80.4:32000/sites/astrojs:b00031 volumeMounts: - mountPath: "/app/cache" name: astrojs-cache