Skip to content

Commit 087bb75

Browse files
hhorakhhorak
committed
Use variables and fix tests
1 parent 7aeb838 commit 087bb75

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎1.10/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed /etc/opt/rh/rh-nginx110/nginx/ngin
6161
chmod -R a+rwx ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6262
chown -R 1001:0 ${NGINX_APP_ROOT} && \
6363
chown -R 1001:0 /var/opt/rh/rh-nginx110 && \
64-
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook
64+
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6565
rpm-file-permissions
6666

6767
USER 1001
@@ -71,8 +71,8 @@ USER 1001
7171
# VOLUME ["/opt/rh/rh-nginx110/root/usr/share/nginx/html"]
7272
# VOLUME ["/var/opt/rh/rh-nginx110/log/nginx/"]
7373

74-
ENV BASH_ENV=/opt/app-root/etc/scl_enable \
75-
ENV=/opt/app-root/etc/scl_enable \
76-
PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
74+
ENV BASH_ENV=${NGINX_APP_ROOT}/etc/scl_enable \
75+
ENV=${NGINX_APP_ROOT}/etc/scl_enable \
76+
PROMPT_COMMAND=". ${NGINX_APP_ROOT}/etc/scl_enable"
7777

7878
CMD $STI_SCRIPTS_PATH/usage

‎1.10/Dockerfile.rhel7

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed /etc/opt/rh/rh-nginx110/nginx/ngin
6363
chmod -R a+rwx ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6464
chown -R 1001:0 ${NGINX_APP_ROOT} && \
6565
chown -R 1001:0 /var/opt/rh/rh-nginx110 && \
66-
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook
66+
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6767
rpm-file-permissions
6868

6969
USER 1001
@@ -73,8 +73,8 @@ USER 1001
7373
# VOLUME ["/opt/rh/rh-nginx110/root/usr/share/nginx/html"]
7474
# VOLUME ["/var/opt/rh/rh-nginx110/log/nginx/"]
7575

76-
ENV BASH_ENV=/opt/app-root/etc/scl_enable \
77-
ENV=/opt/app-root/etc/scl_enable \
78-
PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
76+
ENV BASH_ENV=${NGINX_APP_ROOT}/etc/scl_enable \
77+
ENV=${NGINX_APP_ROOT}/etc/scl_enable \
78+
PROMPT_COMMAND=". ${NGINX_APP_ROOT}/etc/scl_enable"
7979

8080
CMD $STI_SCRIPTS_PATH/usage

‎1.12/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed /etc/opt/rh/rh-nginx112/nginx/ngin
6060
chmod -R a+rwx ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6161
chown -R 1001:0 ${NGINX_APP_ROOT} && \
6262
chown -R 1001:0 /var/opt/rh/rh-nginx112 && \
63-
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook
63+
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6464
rpm-file-permissions
6565

6666
USER 1001
@@ -70,8 +70,8 @@ USER 1001
7070
# VOLUME ["/opt/rh/rh-nginx112/root/usr/share/nginx/html"]
7171
# VOLUME ["/var/opt/rh/rh-nginx112/log/nginx/"]
7272

73-
ENV BASH_ENV=/opt/app-root/etc/scl_enable \
74-
ENV=/opt/app-root/etc/scl_enable \
75-
PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
73+
ENV BASH_ENV=${NGINX_APP_ROOT}/etc/scl_enable \
74+
ENV=${NGINX_APP_ROOT}/etc/scl_enable \
75+
PROMPT_COMMAND=". ${NGINX_APP_ROOT}/etc/scl_enable"
7676

7777
CMD $STI_SCRIPTS_PATH/usage

‎1.12/Dockerfile.rhel7

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed /etc/opt/rh/rh-nginx112/nginx/ngin
6262
chmod -R a+rwx ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6363
chown -R 1001:0 ${NGINX_APP_ROOT} && \
6464
chown -R 1001:0 /var/opt/rh/rh-nginx112 && \
65-
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook
65+
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6666
rpm-file-permissions
6767

6868
USER 1001

‎1.8/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed /etc/opt/rh/rh-nginx18/nginx/nginx
6161
chmod -R a+rwx ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6262
chown -R 1001:0 ${NGINX_APP_ROOT} && \
6363
chown -R 1001:0 /var/opt/rh/rh-nginx18 && \
64-
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook
64+
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6565
rpm-file-permissions
6666

6767
USER 1001
@@ -71,8 +71,8 @@ USER 1001
7171
# VOLUME ["/opt/rh/rh-nginx18/root/usr/share/nginx/html"]
7272
# VOLUME ["/var/opt/rh/rh-nginx18/log/nginx/"]
7373

74-
ENV BASH_ENV=/opt/app-root/etc/scl_enable \
75-
ENV=/opt/app-root/etc/scl_enable \
76-
PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
74+
ENV BASH_ENV=${NGINX_APP_ROOT}/etc/scl_enable \
75+
ENV=${NGINX_APP_ROOT}/etc/scl_enable \
76+
PROMPT_COMMAND=". ${NGINX_APP_ROOT}/etc/scl_enable"
7777

7878
CMD $STI_SCRIPTS_PATH/usage

‎1.8/Dockerfile.rhel7

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN sed -i -f ${NGINX_APP_ROOT}/nginxconf.sed /etc/opt/rh/rh-nginx18/nginx/nginx
6363
chmod -R a+rwx ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6464
chown -R 1001:0 ${NGINX_APP_ROOT} && \
6565
chown -R 1001:0 /var/opt/rh/rh-nginx18 && \
66-
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook
66+
chown -R 1001:0 ${NGINX_CONTAINER_SCRIPTS_PATH}/nginx-start-hook && \
6767
rpm-file-permissions
6868

6969
USER 1001
@@ -73,8 +73,8 @@ USER 1001
7373
# VOLUME ["/opt/rh/rh-nginx18/root/usr/share/nginx/html"]
7474
# VOLUME ["/var/opt/rh/rh-nginx18/log/nginx/"]
7575

76-
ENV BASH_ENV=/opt/app-root/etc/scl_enable \
77-
ENV=/opt/app-root/etc/scl_enable \
78-
PROMPT_COMMAND=". /opt/app-root/etc/scl_enable"
76+
ENV BASH_ENV=${NGINX_APP_ROOT}/etc/scl_enable \
77+
ENV=${NGINX_APP_ROOT}/etc/scl_enable \
78+
PROMPT_COMMAND=". ${NGINX_APP_ROOT}/etc/scl_enable"
7979

8080
CMD $STI_SCRIPTS_PATH/usage

‎1.8/test/test-app/nginx-default-cfg/alias.conf renamed to ‎examples/1.8/test-app/nginx-default-cfg/alias.conf

File renamed without changes.

0 commit comments

Comments
 (0)