Skip to content

Update Dockerfile #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Feb 21, 2023
Merged

Update Dockerfile #1773

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
19e45ce
Tuning chmod permissions
diemol Jan 17, 2023
86597e7
Kick CI
diemol Jan 17, 2023
635bf3a
More tuning
diemol Jan 17, 2023
593a7b7
Tuning a bit more
diemol Jan 17, 2023
8f79bc3
Update Dockerfile
StevenBOULLE Jan 18, 2023
3c43228
Update Dockerfile
StevenBOULLE Jan 18, 2023
9879ce4
Tuning chmod permissions
diemol Jan 17, 2023
8cd2be3
More tuning
diemol Jan 17, 2023
8e0c6da
Tuning a bit more
diemol Jan 17, 2023
54af9f8
Merge branch 'update-chmod-permissions' into patch-2
diemol Jan 18, 2023
f989664
Change group for some directories
StevenBOULLE Jan 18, 2023
9d57134
Usage of ACL
StevenBOULLE Jan 18, 2023
a88fda8
Install ACL package
StevenBOULLE Jan 18, 2023
cc9bc31
Merge branch 'trunk' into patch-2
StevenBOULLE Jan 18, 2023
0f38e31
typo in command setfacl
StevenBOULLE Jan 18, 2023
a8efbdb
change stefacl location on script
StevenBOULLE Jan 18, 2023
ac6d1ba
Change setfacl location once again
StevenBOULLE Jan 23, 2023
01b3bc2
add acl to /opt
StevenBOULLE Jan 23, 2023
ad03b28
Update Dockerfile
StevenBOULLE Feb 20, 2023
5239696
Merge branch 'trunk' into patch-2
StevenBOULLE Feb 20, 2023
0330988
Merge branch 'trunk' into patch-2
StevenBOULLE Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
#========================
RUN apt-get -qqy update \
&& apt-get -qqy --no-install-recommends install \
acl \
bzip2 \
ca-certificates \
openjdk-11-jre-headless \
Expand Down Expand Up @@ -70,13 +71,14 @@ COPY supervisord.conf /etc
#==========
RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
&& touch /opt/selenium/config.toml \
&& chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
&& chmod -R 775 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
&& setfacl -Rm u:seluser:rwx /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.7.0/selenium-server-4.7.2.jar \
-O /opt/selenium/selenium-server.jar \
&& wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.7.2/selenium-http-jdk-client-4.7.2.jar \
-O /opt/selenium/selenium-http-jdk-client.jar \
&& chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
&& chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor
&& chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor

#=====
# Download observability related jaegar jars and make them available in a separate directory
Expand All @@ -85,11 +87,11 @@ RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/su
RUN curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier \
&& chmod +x /tmp/cs \
&& mkdir -p /external_jars \
&& chmod -R 777 /external_jars
&& chmod -R 775 /external_jars

RUN /tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.19.0 io.grpc:grpc-netty:1.50.2 > /external_jars/.classpath.txt

RUN chmod 777 /external_jars/.classpath.txt
RUN chmod 664 /external_jars/.classpath.txt

#===================================================
# Run the following commands as non-privileged user
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ RUN mkdir -p ${HOME}/.vnc \
#==========
# Relaxing permissions for OpenShift and other non-sudo environments
#==========
RUN sudo chmod -R 777 ${HOME} \
RUN sudo chmod -R 775 ${HOME} \
&& sudo chgrp -R 0 ${HOME} \
&& sudo chmod -R g=u ${HOME}

Expand Down