Skip to content

Commit 75f56b3

Browse files
author
Bernd Doser
committed
replace entrypoint from /root/ to /
1 parent b7475b9 commit 75f56b3

File tree

13 files changed

+25
-25
lines changed

13 files changed

+25
-25
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pipeline {
44

55
agent {
66
docker {
7-
image 'braintwister/ubuntu-16.04-docker-18.09'
7+
image 'braintwister/ubuntu-18.04-docker-18.09'
88
args '-v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_CONFIG=/tmp'
99
alwaysPull true
1010
}

alpine-3.7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apk add --no-cache \
1414
COPY aliases /tmp/
1515
RUN cat /tmp/aliases >> /etc/bash.bashrc && rm -f /tmp/aliases
1616

17-
ADD entrypoint.sh /root/
18-
ENTRYPOINT ["/root/entrypoint.sh"]
17+
ADD entrypoint.sh /
18+
ENTRYPOINT ["/entrypoint.sh"]
1919

2020
CMD ["/bin/bash"]

alpine-3.7/entrypoint.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ then
1616
cd $HOME
1717

1818
# Execute entrypoint modules
19-
if [ -d "/root/entrypoint.d" ]; then
20-
for f in /root/entrypoint.d/*.sh; do
19+
if [ -d "/entrypoint.d" ]; then
20+
for f in /entrypoint.d/*.sh; do
2121
. "$f" || break
2222
done
2323
fi
@@ -30,8 +30,8 @@ else
3030
fi
3131

3232
# Execute postprocess modules
33-
if [ -d "/root/postprocess.d" ]; then
34-
for f in /root/postprocess.d/*.sh; do
33+
if [ -d "/postprocess.d" ]; then
34+
for f in /postprocess.d/*.sh; do
3535
. "$f" || break
3636
done
3737
fi

conan-1.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ RUN pip3 install --upgrade pip \
1414
&& pip3 install -I conan~=1.12
1515

1616
# Add entrypoint
17-
ADD conan_add_repositories.sh /root/entrypoint.d/
17+
ADD conan_add_repositories.sh /entrypoint.d/

docker-18.09/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ RUN apt-get update \
2222
&& apt-get clean \
2323
&& rm -rf /var/lib/apt/lists/*
2424

25-
ADD add_user_to_docker_group.sh /root/entrypoint.d/
25+
ADD add_user_to_docker_group.sh /entrypoint.d/

docker-nightly/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ RUN apt-get update \
2222
&& apt-get clean \
2323
&& rm -rf /var/lib/apt/lists/*
2424

25-
ADD add_user_to_docker_group.sh /root/entrypoint.d/
25+
ADD add_user_to_docker_group.sh /entrypoint.d/

eclipse-cpp-2018-09/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ RUN curl -L "$DOWNLOAD_URL" | tar xz -C $INSTALLATION_DIR
3434
ADD install_plugins.py plugins.yml /config/
3535
RUN /config/install_plugins.py -p /config/plugins.yml
3636

37-
ADD entrypoint_eclipse.sh /root/entrypoint.d/
37+
ADD entrypoint_eclipse.sh /entrypoint.d/
3838

3939
CMD "$INSTALLATION_DIR/eclipse/eclipse"

eclipse-cpp-2018-12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ RUN curl -L "$DOWNLOAD_URL" | tar xz -C $INSTALLATION_DIR
3434
ADD install_plugins.py plugins.yml /config/
3535
RUN /config/install_plugins.py -p /config/plugins.yml
3636

37-
ADD entrypoint_eclipse.sh /root/entrypoint.d/
37+
ADD entrypoint_eclipse.sh /entrypoint.d/
3838

3939
CMD "$INSTALLATION_DIR/eclipse/eclipse"

ubuntu-16.04/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN pip3 install --upgrade pip \
2828
COPY aliases /tmp/
2929
RUN cat /tmp/aliases >> /etc/bash.bashrc && rm -f /tmp/aliases
3030

31-
ADD entrypoint.sh /root/
32-
ENTRYPOINT ["/root/entrypoint.sh"]
31+
ADD entrypoint.sh /
32+
ENTRYPOINT ["/entrypoint.sh"]
3333

3434
CMD ["/bin/bash"]

ubuntu-16.04/entrypoint.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ then
1616
cd $HOME
1717

1818
# Execute entrypoint modules
19-
if [ -d "/root/entrypoint.d" ]; then
20-
for f in /root/entrypoint.d/*.sh; do
19+
if [ -d "/entrypoint.d" ]; then
20+
for f in /entrypoint.d/*.sh; do
2121
. "$f" || break
2222
done
2323
fi
@@ -30,8 +30,8 @@ else
3030
fi
3131

3232
# Execute postprocess modules
33-
if [ -d "/root/postprocess.d" ]; then
34-
for f in /root/postprocess.d/*.sh; do
33+
if [ -d "/postprocess.d" ]; then
34+
for f in /postprocess.d/*.sh; do
3535
. "$f" || break
3636
done
3737
fi

ubuntu-18.04/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN pip3 install --upgrade pip \
3030
COPY aliases /tmp/
3131
RUN cat /tmp/aliases >> /etc/bash.bashrc && rm -f /tmp/aliases
3232

33-
ADD entrypoint.sh /root/
34-
ENTRYPOINT ["/root/entrypoint.sh"]
33+
ADD entrypoint.sh /
34+
ENTRYPOINT ["/entrypoint.sh"]
3535

3636
CMD ["/bin/bash"]

ubuntu-18.04/entrypoint.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ then
1616
cd $HOME
1717

1818
# Execute entrypoint modules
19-
if [ -d "/root/entrypoint.d" ]; then
20-
for f in /root/entrypoint.d/*.sh; do
19+
if [ -d "/entrypoint.d" ]; then
20+
for f in /entrypoint.d/*.sh; do
2121
. "$f" || break
2222
done
2323
fi
@@ -30,8 +30,8 @@ else
3030
fi
3131

3232
# Execute postprocess modules
33-
if [ -d "/root/postprocess.d" ]; then
34-
for f in /root/postprocess.d/*.sh; do
33+
if [ -d "/postprocess.d" ]; then
34+
for f in /postprocess.d/*.sh; do
3535
. "$f" || break
3636
done
3737
fi

vscode-1.32/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ RUN apt-get update \
1919
&& rm ./code.deb \
2020
&& rm -rf /var/lib/apt/lists/*
2121

22-
ADD keep_running.sh /root/postprocess.d/
22+
ADD keep_running.sh /postprocess.d/
2323

2424
CMD ["code"]

0 commit comments

Comments
 (0)