From 45e60d70a3dee52c41ce312a559db976c54b4251 Mon Sep 17 00:00:00 2001 From: Stephane Gourichon Date: Fri, 15 Aug 2025 17:35:40 +0200 Subject: [PATCH] Use common base image. --- partials/fsg-image/Dockerfile | 6 ++++++ partials/fsg-image/build.sh | 7 +++++++ service_definitions/public/gourichon_org/domain/Dockerfile | 4 +--- tools/build_and_up_all_containers.sh | 2 ++ 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 partials/fsg-image/Dockerfile create mode 100755 partials/fsg-image/build.sh diff --git a/partials/fsg-image/Dockerfile b/partials/fsg-image/Dockerfile new file mode 100644 index 0000000..ae199f3 --- /dev/null +++ b/partials/fsg-image/Dockerfile @@ -0,0 +1,6 @@ +FROM debian:stable-slim +MAINTAINER Stéphane Gourichon + +RUN echo 'Acquire::http { Proxy "http://host.containers.internal:3142"; };' > /etc/apt/apt.conf.d/01proxy + +RUN export DEBIAN_FRONTEND=noninteractive ; apt-get update && apt-get -y upgrade diff --git a/partials/fsg-image/build.sh b/partials/fsg-image/build.sh new file mode 100755 index 0000000..179da0d --- /dev/null +++ b/partials/fsg-image/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -xv + +cd -P "$(dirname "$(readlink -f "$0")" )" + +podman build -f Dockerfile -t fsg-base diff --git a/service_definitions/public/gourichon_org/domain/Dockerfile b/service_definitions/public/gourichon_org/domain/Dockerfile index 0b6eac7..ca37197 100644 --- a/service_definitions/public/gourichon_org/domain/Dockerfile +++ b/service_definitions/public/gourichon_org/domain/Dockerfile @@ -1,7 +1,5 @@ -FROM debian:stable-slim -MAINTAINER Stéphane Gourichon +FROM fsg-base:latest -RUN export DEBIAN_FRONTEND=noninteractive ; apt-get update && apt-get -y upgrade RUN export DEBIAN_FRONTEND=noninteractive ; apt-get install --no-install-recommends -y bind9 COPY named.conf.local /etc/bind/ diff --git a/tools/build_and_up_all_containers.sh b/tools/build_and_up_all_containers.sh index 70bf920..0192a49 100755 --- a/tools/build_and_up_all_containers.sh +++ b/tools/build_and_up_all_containers.sh @@ -16,6 +16,8 @@ function fail_one() RC=$(( RC + 1 )) } +bash partials/fsg-image/build.sh + while IFS="" read -u 3 -r SERVICE_PATH do pushd "${SERVICE_PATH%/*}"