From 6eef7c911f819b8a58502ebbf8cffccbbdeb6a30 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 23 Aug 2024 17:47:04 +0200 Subject: [PATCH] speed up the roundtrip --- infrastructure/backup/image/Dockerfile | 3 ++- .../backup/image/resources/{init.bb => init-bb.bb} | 0 infrastructure/backup/image/resources/install.sh | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename infrastructure/backup/image/resources/{init.bb => init-bb.bb} (100%) diff --git a/infrastructure/backup/image/Dockerfile b/infrastructure/backup/image/Dockerfile index 92da715..24e9b47 100644 --- a/infrastructure/backup/image/Dockerfile +++ b/infrastructure/backup/image/Dockerfile @@ -2,5 +2,6 @@ FROM ubuntu:24.04 # install it ADD resources /tmp/ -ADD local/ /usr/local/lib/dda-backup RUN /tmp/install.sh +ADD local/ /usr/local/lib/dda-backup +RUN init-bb.bb diff --git a/infrastructure/backup/image/resources/init.bb b/infrastructure/backup/image/resources/init-bb.bb similarity index 100% rename from infrastructure/backup/image/resources/init.bb rename to infrastructure/backup/image/resources/init-bb.bb diff --git a/infrastructure/backup/image/resources/install.sh b/infrastructure/backup/image/resources/install.sh index b03c4cd..559ad1a 100755 --- a/infrastructure/backup/image/resources/install.sh +++ b/infrastructure/backup/image/resources/install.sh @@ -15,7 +15,7 @@ function babashka_install() { function main() { { upgradeSystem - apt-get install -qqy ca-certificates curl gnupg postgresql-client-16 restic openjdk-21-jre-headless + apt-get install -qqy ca-certificates curl gnupg postgresql-client-16 restic openjdk-21-jre-headless nano 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 @@ -23,8 +23,7 @@ function main() { } > /dev/null update-ca-certificates - /tmp/init.bb - + install -m 0700 -o root -g root /tmp/init-bb.bb /usr/local/bin/ cleanupDocker }