From 115dac6ded7e94840dcdd2a40b111599fcd4dbbb Mon Sep 17 00:00:00 2001 From: Mirco Date: Thu, 7 Dec 2023 20:52:34 +0100 Subject: [PATCH] Improvements docker image building --- infrastructure/docker/image/resources/install.sh | 11 +++++------ infrastructure/docker/test/Dockerfile | 9 --------- infrastructure/docker/test/serverspec.edn | 5 ----- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 infrastructure/docker/test/Dockerfile delete mode 100644 infrastructure/docker/test/serverspec.edn diff --git a/infrastructure/docker/image/resources/install.sh b/infrastructure/docker/image/resources/install.sh index a26fb6d..b929511 100755 --- a/infrastructure/docker/image/resources/install.sh +++ b/infrastructure/docker/image/resources/install.sh @@ -4,12 +4,11 @@ set -exo pipefail function main() { { - apt-get update - apt-get upgrade -y - apt-get install -qqy ca-certificates curl gnupg postgresql-client-14 - curl -Ss --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg - sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - apt-get upgrade -y + upgradeSystem + apt-get install -qqy ca-certificates curl gnupg postgresql-client-14 + curl -Ss --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg + sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/postgresql-common_pgdg_archive_keyring.gpg] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + upgradeSystem } > /dev/null update-ca-certificates diff --git a/infrastructure/docker/test/Dockerfile b/infrastructure/docker/test/Dockerfile deleted file mode 100644 index 70e1a30..0000000 --- a/infrastructure/docker/test/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM dda-backup - -RUN apt update > /dev/null && apt -yqq install openjdk-13-jre-headless > /dev/null - -RUN curl -L -o /tmp/serverspec.jar https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar - -COPY serverspec.edn /tmp/serverspec.edn - -RUN java -jar /tmp/serverspec.jar /tmp/serverspec.edn -v diff --git a/infrastructure/docker/test/serverspec.edn b/infrastructure/docker/test/serverspec.edn deleted file mode 100644 index d86448a..0000000 --- a/infrastructure/docker/test/serverspec.edn +++ /dev/null @@ -1,5 +0,0 @@ -{:package [{:name "restic"} - {:name "postgresql-client-14"}] - :file [{:path "/usr/local/lib/functions.sh" :mod "400"} - {:path "/usr/local/lib/pg-functions.sh" :mod "400"} - {:path "/usr/local/lib/file-functions.sh" :mod "400"}]}