From 3095050ebf529921762a22f6c164ed7b9f0f50b1 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Thu, 22 Aug 2024 09:00:22 +0200 Subject: [PATCH] update image --- infrastructure/backup/image/resources/install.sh | 4 ++-- infrastructure/backup/test/Dockerfile | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/infrastructure/backup/image/resources/install.sh b/infrastructure/backup/image/resources/install.sh index 1d60ff1..f51ee2e 100755 --- a/infrastructure/backup/image/resources/install.sh +++ b/infrastructure/backup/image/resources/install.sh @@ -15,11 +15,11 @@ function babashka_install() { function main() { { upgradeSystem - apt-get install -qqy ca-certificates curl gnupg postgresql-client-16 restic + apt-get install -qqy ca-certificates curl gnupg postgresql-client-16 restic openjdk-21-jre-headless 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 - babashka_install + babashka_install } > /dev/null update-ca-certificates diff --git a/infrastructure/backup/test/Dockerfile b/infrastructure/backup/test/Dockerfile index b6d31fd..24d00ac 100644 --- a/infrastructure/backup/test/Dockerfile +++ b/infrastructure/backup/test/Dockerfile @@ -1,7 +1,6 @@ -FROM c4k-forgejo-backup:latest +FROM dda-backup:latest # install it -RUN apt update && apt install -qqy openjdk-17-jre-headless -ADD local/ /usr/local/lib/dda-backup +#ADD local/ /usr/local/lib/dda-backup ADD resources /tmp/ RUN ENV_PASSWORD=env-password /tmp/test.bb