Skip to content

Commit 170c5a9

Browse files
committed
fix(docker): update base images and entrypoints
Update Fedora and Ubuntu Dockerfiles to use fully qualified image names from docker.io/library. Change ENTRYPOINT to exec form for consistency. Remove redundant yum install from Fedora Dockerfile. Minor formatting improvements in install-node.sh.
1 parent 5e06e76 commit 170c5a9

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
FROM fedora:latest
1+
FROM docker.io/library/fedora:latest
22

33
# workaround for timezone manual intervention
44
ENV TZ=Europe/London
55
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
66

77
COPY install-node.sh /
8-
RUN yum update -y \
9-
&& yum install curl diffutils awk -y \
10-
&& chmod +x /install-node.sh
8+
RUN chmod +x /install-node.sh
119

12-
CMD ./install-node.sh
10+
ENTRYPOINT ["./install-node.sh"]

cabal_build_tests/install-node.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ else
4545
fi
4646

4747
# Install dependencies
48+
4849
echo "Install dependencies"
4950
if [[ "$(</etc/os-release)" == *"fedora"* ]]; then
5051
echo "Running on Fedora"

cabal_build_tests/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:latest
1+
FROM docker.io/library/ubuntu:latest
22

33
# workaround for timezone manual intervention
44
ENV TZ=Europe/London
@@ -9,4 +9,4 @@ RUN apt-get update -y \
99
&& apt-get install curl -y \
1010
&& chmod +x /install-node.sh
1111

12-
ENTRYPOINT ./install-node.sh
12+
ENTRYPOINT ["./install-node.sh"]

0 commit comments

Comments
 (0)