Skip to content

Commit 7294598

Browse files
author
Paul FREAKN Baker
committed
Adding explicit entrypoint and expanding command
1 parent 2be82c4 commit 7294598

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

docker-environment/Dockerfile.ubuntu

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ RUN useradd --create-home git-user
1515
RUN usermod -aG sudo git-user
1616
RUN echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
1717
USER git-user
18-
WORKDIR /home/git-user
18+
WORKDIR /home/git-user
19+
ENTRYPOINT [ "/usr/bin/bash", "-c" ]

docker-environment/docker-compose.yaml

+12-4
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,36 @@ services:
88
UBUNTU_VERSION: "14.04"
99
volumes:
1010
- "../compile-git-with-openssl.sh:/home/git-user/compile-git-with-openssl.sh:ro"
11-
command: "./compile-git-with-openssl.sh --skip-tests"
11+
command:
12+
- "./compile-git-with-openssl.sh"
13+
- "--skip-tests"
1214
ubuntu_16.04:
1315
build:
1416
dockerfile: Dockerfile.ubuntu
1517
args:
1618
UBUNTU_VERSION: "16.04"
1719
volumes:
1820
- "../compile-git-with-openssl.sh:/home/git-user/compile-git-with-openssl.sh:ro"
19-
command: "./compile-git-with-openssl.sh --skip-tests"
21+
command:
22+
- "./compile-git-with-openssl.sh"
23+
- "--skip-tests"
2024
ubuntu_18.04:
2125
build:
2226
dockerfile: Dockerfile.ubuntu
2327
args:
2428
UBUNTU_VERSION: "18.04"
2529
volumes:
2630
- "../compile-git-with-openssl.sh:/home/git-user/compile-git-with-openssl.sh:ro"
27-
command: "./compile-git-with-openssl.sh --skip-tests"
31+
command:
32+
- "./compile-git-with-openssl.sh"
33+
- "--skip-tests"
2834
ubuntu_20.04:
2935
build:
3036
dockerfile: Dockerfile.ubuntu
3137
args:
3238
UBUNTU_VERSION: "20.04"
3339
volumes:
3440
- "../compile-git-with-openssl.sh:/home/git-user/compile-git-with-openssl.sh:ro"
35-
command: "./compile-git-with-openssl.sh --skip-tests"
41+
command:
42+
- "./compile-git-with-openssl.sh"
43+
- "--skip-tests"

0 commit comments

Comments
 (0)