update openresty (#12)

* update openresty folders
* debug openresty

docker_casdoor/Dockerfile

@@ -6,15 +6,15 @@ ARG BASE_IMG="node"
 
 FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG_BUILD} as builder
 COPY work /opt/utils/
-RUN set -ex \
+RUN set -eux \
  && source /opt/utils/script-setup-casdoor.sh \
  && setup_casdoor
 
 
 FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
 COPY --from=builder /opt/casdoor /opt/casdoor
 COPY work/app.conf /opt/casdoor/conf/app.conf
-RUN set -ex \
+RUN set -eux \
  && mkdir -pv /root/web && ln -sf /opt/casdoor/web/build /root/web/
 
 LABEL maintainer="[email protected]"

docker_dev_box/dev.Dockerfile

@@ -16,7 +16,7 @@ ARG ARG_KEEP_NODEJS=true
 
 COPY work /opt/utils/
 
-RUN set -ex && source /opt/utils/script-utils.sh \
+RUN set -eux && source /opt/utils/script-utils.sh \
  # Setup Jupyter: Basic Configurations and Extensions
  && mkdir -pv /opt/conda/etc/jupyter/ \
  && mv /opt/utils/etc_jupyter/* /opt/conda/etc/jupyter/ && rm -rf /opt/utils/etc_jupyter \

docker_dev_box/hub.Dockerfile

@@ -13,7 +13,7 @@ ARG ARG_KEEP_NODEJS=true
 
 COPY work /opt/utils/
 
-RUN set -ex \
+RUN set -eux \
  # Setup JupyterHub
  && source /opt/utils/script-devbox-jupyter.sh \
  && mv /opt/utils/start-*.sh /usr/local/bin/ && chmod +x /usr/local/bin/start-*.sh \

docker_keycloak/Dockerfile

@@ -1,14 +1,14 @@
 # Distributed under the terms of the Modified BSD License.
 
 ARG BASE_NAMESPACE
-ARG BASE_IMG="jdk17"
+ARG BASE_IMG="jdk-17"
 FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
 
 LABEL maintainer="[email protected]"
 
 COPY work /opt/utils/
 
-RUN set -ex \
+RUN set -eux \
  && source /opt/utils/script-setup-keycloak.sh && setup_keycloak \
  && echo "keycloak:x:0:root" >> /etc/group \
  && echo "keycloak:x:1000:0:keycloak user:/opt/keycloak:/sbin/nologin" >> /etc/passwd \

docker_openresty/Dockerfile

@@ -8,16 +8,19 @@ LABEL maintainer="[email protected]"
 
 COPY work /opt/utils/
 
-RUN set -ex \
+RUN set -eux \
+ && useradd nginx -G www-data \
+ && mkdir -pv /var/cache/nginx /var/log/nginx \
+ && chown -R nginx:www-data /var/cache/nginx /var/log/nginx \
  && source /opt/utils/script-utils.sh && install_apt /opt/utils/install_list_openresty.apt \
  && source /opt/utils/script-setup.sh           && setup_lua_base && setup_lua_rocks \
  && source /opt/utils/script-setup-openresty.sh && setup_openresty \
  && source /opt/utils/script-setup-acme.sh      && setup_acme \
  && pip install certbot \
- && useradd nginx -G www-data \
- && mkdir -pv /var/cache/nginx /var/log/nginx \
  && install__clean
 
+VOLUME [ "/var/log/nginx", "/var/cache/nginx" ]
+
 CMD ["/opt/nginx/bin/nginx", "-g", "daemon off;"]
 
 # Use SIGQUIT instead of default SIGTERM to cleanly drain requests

docker_openresty/work/script-setup-openresty.sh

@@ -61,6 +61,10 @@ setup_openresty() {
     --with-pcre \
     --with-pcre-jit \
  && make -j8 && make install \
+ && mkdir -pv /usr/local/openresty/ /var/log/nginx /var/cache/nginx /tmp/nginx \
  && ln -sf ${NGINX_HOME}/bin/nginx /usr/bin/ \
+ && ln -sf /opt/nginx /usr/local/openresty/ \
+ && ln -sf /opt/nginx /etc/ \
+ && nginx -t \
  && echo "@ Version info of Nginx: $(nginx -version)"
 }