|
@@ -586,7 +586,11 @@ COPY --chown=${USER_UID}:${USER_GID} supervisord.conf /etc/supervisord.conf
|
|
|
COPY --chown=${USER_UID}:${USER_GID} nginx.conf /etc/nginx/nginx.conf
|
|
COPY --chown=${USER_UID}:${USER_GID} nginx.conf /etc/nginx/nginx.conf
|
|
|
COPY --chown=${USER_UID}:${USER_GID} nginx-entrypoint.sh /etc/nginx-entrypoint.sh
|
|
COPY --chown=${USER_UID}:${USER_GID} nginx-entrypoint.sh /etc/nginx-entrypoint.sh
|
|
|
|
|
|
|
|
-RUN chmod 0755 \
|
|
|
|
|
|
|
+RUN sed -i 's/\r$//' \
|
|
|
|
|
+ /etc/entrypoint.sh \
|
|
|
|
|
+ /etc/selkies-entrypoint.sh \
|
|
|
|
|
+ /etc/nginx-entrypoint.sh \
|
|
|
|
|
+ && chmod 0755 \
|
|
|
/etc/entrypoint.sh \
|
|
/etc/entrypoint.sh \
|
|
|
/etc/selkies-entrypoint.sh \
|
|
/etc/selkies-entrypoint.sh \
|
|
|
/etc/nginx-entrypoint.sh \
|
|
/etc/nginx-entrypoint.sh \
|
|
@@ -594,8 +598,6 @@ RUN chmod 0755 \
|
|
|
|
|
|
|
|
USER ${USER_UID}:${USER_GID}
|
|
USER ${USER_UID}:${USER_GID}
|
|
|
|
|
|
|
|
-RUN sed -i 's/\r$//' /etc/nginx-entrypoint.sh
|
|
|
|
|
-
|
|
|
|
|
ENV USER="${USER_NAME}" \
|
|
ENV USER="${USER_NAME}" \
|
|
|
HOME="/home/${USER_NAME}" \
|
|
HOME="/home/${USER_NAME}" \
|
|
|
SHELL="/bin/bash"
|
|
SHELL="/bin/bash"
|