From 695c85405aba361a5b0a2177c47b895aefdaf233 Mon Sep 17 00:00:00 2001 From: Mirco Date: Thu, 21 Dec 2023 19:57:38 +0100 Subject: [PATCH] Improvements docker image building --- .gitlab-ci.yml | 2 +- infrastructure/docker/image/Dockerfile | 2 +- infrastructure/docker/image/resources/install.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a964d3b..93e0445 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - image .img: &img - image: "domaindrivenarchitecture/ddadevops-dind:4.10.0" + image: "domaindrivenarchitecture/ddadevops-dind:4.10.5" services: - docker:dind before_script: diff --git a/infrastructure/docker/image/Dockerfile b/infrastructure/docker/image/Dockerfile index e7b61da..c5cf7e8 100644 --- a/infrastructure/docker/image/Dockerfile +++ b/infrastructure/docker/image/Dockerfile @@ -2,4 +2,4 @@ FROM ubuntu:jammy # install it ADD resources /tmp/ -RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes /tmp/install.sh +RUN /tmp/install.sh diff --git a/infrastructure/docker/image/resources/install.sh b/infrastructure/docker/image/resources/install.sh index b929511..eaa94b0 100755 --- a/infrastructure/docker/image/resources/install.sh +++ b/infrastructure/docker/image/resources/install.sh @@ -20,5 +20,5 @@ function main() { cleanupDocker } -source /tmp/install_functions.sh -main +source /tmp/install_functions_debian.sh +DEBIAN_FRONTEND=noninteractive DEBCONF_NOWARNINGS=yes main