From 75412a49a1a6c4099967b78d80290ec5c3f4bf0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez?= Date: Fri, 25 Oct 2024 18:48:10 +0200 Subject: [PATCH] Minor modifications to docker builder --- pkg/deb/docker/Dockerfile.amd64 | 23 ++++++++++++----------- pkg/deb/docker/Dockerfile.arm64 | 23 ++++++++++++----------- pkg/rpm/docker/Dockerfile.aarch64 | 1 + pkg/rpm/docker/Dockerfile.x86_64 | 1 + 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/pkg/deb/docker/Dockerfile.amd64 b/pkg/deb/docker/Dockerfile.amd64 index d29bd67..2e0a8b1 100644 --- a/pkg/deb/docker/Dockerfile.amd64 +++ b/pkg/deb/docker/Dockerfile.amd64 @@ -1,12 +1,13 @@ -FROM amd64/ubuntu:xenial - -RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ - sed -i 's|deb http://security|#deb http://security|g' /etc/apt/sources.list && \ - apt update && \ - apt install -y curl devscripts equivs tar gcc gzip pkg-config git && \ - mkdir -p /tmp/output - -# It requires to copy the entrypoint.sh to the docker folder. -ADD entrypoint.sh /usr/local/bin/entrypoint.sh - +FROM ubuntu:xenial + +RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ + sed -i 's|deb http://security|#deb http://security|g' /etc/apt/sources.list && \ + apt update && \ + apt install -y curl devscripts equivs tar gcc gzip pkg-config git && \ + mkdir -p /tmp/output + +# It requires to copy the entrypoint.sh to the docker folder. +ADD entrypoint.sh /usr/local/bin/entrypoint.sh +RUN chmod +x /usr/local/bin/entrypoint.sh + ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file diff --git a/pkg/deb/docker/Dockerfile.arm64 b/pkg/deb/docker/Dockerfile.arm64 index fec286c..2e0a8b1 100644 --- a/pkg/deb/docker/Dockerfile.arm64 +++ b/pkg/deb/docker/Dockerfile.arm64 @@ -1,12 +1,13 @@ -FROM arm64/ubuntu:xenial - -RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ - sed -i 's|deb http://security|#deb http://security|g' /etc/apt/sources.list && \ - apt update && \ - apt install -y curl devscripts equivs tar gcc gzip pkg-config git && \ - mkdir -p /tmp/output - -# It requires to copy the entrypoint.sh to the docker folder. -ADD entrypoint.sh /usr/local/bin/entrypoint.sh - +FROM ubuntu:xenial + +RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \ + sed -i 's|deb http://security|#deb http://security|g' /etc/apt/sources.list && \ + apt update && \ + apt install -y curl devscripts equivs tar gcc gzip pkg-config git && \ + mkdir -p /tmp/output + +# It requires to copy the entrypoint.sh to the docker folder. +ADD entrypoint.sh /usr/local/bin/entrypoint.sh +RUN chmod +x /usr/local/bin/entrypoint.sh + ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file diff --git a/pkg/rpm/docker/Dockerfile.aarch64 b/pkg/rpm/docker/Dockerfile.aarch64 index ef1959a..6adcdc1 100644 --- a/pkg/rpm/docker/Dockerfile.aarch64 +++ b/pkg/rpm/docker/Dockerfile.aarch64 @@ -5,5 +5,6 @@ RUN yum update -y && \ mkdir -p /tmp/output ADD entrypoint.sh /usr/local/bin/entrypoint.sh +RUN chmod +x /usr/local/bin/entrypoint.sh ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file diff --git a/pkg/rpm/docker/Dockerfile.x86_64 b/pkg/rpm/docker/Dockerfile.x86_64 index ebc4488..12ff207 100644 --- a/pkg/rpm/docker/Dockerfile.x86_64 +++ b/pkg/rpm/docker/Dockerfile.x86_64 @@ -8,5 +8,6 @@ RUN yum update -y && \ mkdir -p /tmp/output ADD entrypoint.sh /usr/local/bin/entrypoint.sh +RUN chmod +x /usr/local/bin/entrypoint.sh ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file