Skip to content
This repository has been archived by the owner on Sep 21, 2021. It is now read-only.

Commit

Permalink
Fixed permissions for nginx.conf (#829)
Browse files Browse the repository at this point in the history
  • Loading branch information
quarckster authored and diemol committed Jan 13, 2019
1 parent 65a3577 commit 9712cb2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ ENV ZAL_VER="${project.build.finalName}" \
SELENIUM_WAIT_FOR_CONTAINER="true"

COPY entry.sh log warn error /usr/bin/
COPY nginx.conf /etc/nginx/
COPY nginx.conf /home/seluser/
COPY css/ /home/seluser/css/
COPY js/ /home/seluser/js/
COPY zalenium.sh \
Expand Down Expand Up @@ -369,9 +369,7 @@ RUN sudo chmod +x /home/seluser/zalenium.sh \
&& sudo chmod +x /usr/bin/error \
&& sudo chmod +x /usr/bin/entry.sh \
&& sudo chmod 777 /etc/passwd \
&& sudo chown -R seluser:seluser /home/seluser \
&& sudo chown -R root:seluser /etc/nginx \
&& sudo chmod -R g+w /etc/nginx
&& sudo chown -R seluser:seluser /home/seluser

# Allows different operations in Openshift environments
# https://docs.openshift.com/container-platform/latest/creating_images/guidelines.html#openshift-specific-guidelines
Expand Down
4 changes: 2 additions & 2 deletions scripts/zalenium.sh
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,10 @@ StartUp()
fi

# In nginx.conf, Replace {{contextPath}} with value of APPEND_CONTEXT_PATH
sed -i.bak "s~{{contextPath}}~${CONTEXT_PATH}~" /etc/nginx/nginx.conf
sed -i.bak "s~{{contextPath}}~${CONTEXT_PATH}~" /home/seluser/nginx.conf

echo "Starting Nginx reverse proxy..."
nginx
nginx -c /home/seluser/nginx.conf

echo "Starting Selenium Hub..."

Expand Down

0 comments on commit 9712cb2

Please sign in to comment.