From 32c2b63775a870f94288d791ef8e0a6c92522345 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sat, 1 Feb 2025 12:44:25 +0100 Subject: [PATCH 1/2] feat: upgrade postgres client to v17 --- Dockerfile | 4 ++-- build-and-push.sh | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63b074f..7431fb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kopia/kopia:0.18 +FROM kopia/kopia:0.19 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y gnupg2 wget lsb-release @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y gnupg2 wget lsb-release RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -RUN apt-get update && apt-get install -y cron postgresql-client-15 lftp && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y cron postgresql-client-17 lftp && rm -rf /var/lib/apt/lists/* ARG KOPIA_CRON_SCHEDULE ENV KOPIA_CRON_SCHEDULE ${KOPIA_CRON_SCHEDULE} diff --git a/build-and-push.sh b/build-and-push.sh index 00d2b1e..9755429 100755 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -1,12 +1,10 @@ #!/usr/bin/env sh -SKIP=no-commit-to-branch,prettier CI=false npx --package semantic-release --package @semantic-release/git semantic-release - -VERSION=`npm pkg get version | sed -e 's/"//g'` - -docker image build --tag git.molez.org/mandlm/kopia:${VERSION} --tag git.molez.org/mandlm/kopia:latest . +VERSION="0.15.0" docker login git.molez.org -docker image push git.molez.org/mandlm/kopia:${VERSION} +docker image build --tag git.molez.org/mandlm/kopia:"${VERSION}" --tag git.molez.org/mandlm/kopia:latest . + +docker image push git.molez.org/mandlm/kopia:"${VERSION}" docker image push git.molez.org/mandlm/kopia:latest From 0ae4e4dee6975538abb71a3fa84f4d3e7d407315 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sat, 1 Feb 2025 12:44:52 +0100 Subject: [PATCH 2/2] chore: nix flake update --- .nix/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.nix/flake.lock b/.nix/flake.lock index b8306c4..2fb1cf9 100644 --- a/.nix/flake.lock +++ b/.nix/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709169036, - "narHash": "sha256-j+ywPKUS0JLpidNcz6vA0z1xI/rU5PcLV7pwZMce+Tw=", + "lastModified": 1738297584, + "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec25c90d35d24e36c0af3b3d58a09542367ebbee", + "rev": "9189ac18287c599860e878e905da550aa6dec1cd", "type": "github" }, "original": {