From a9c96d5854114fbac86994a9124d9d1c4afee743 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sat, 19 Aug 2023 12:13:19 +0200 Subject: [PATCH 01/16] feat: set backup path as arg --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index de835e9..437d393 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,9 @@ ENV KOPIA_HOSTNAME ${KOPIA_HOSTNAME} ARG KOPIA_PASSWORD ENV KOPIA_PASSWORD ${KOPIA_PASSWORD} +ARG KOPIA_BACKUP_PATH=/backup +ENV KOPIA_BACKUP_PATH ${KOPIA_BACKUP_PATH} + ADD run-backup.sh / ADD entrypoint.sh / From d56546566539a9647910ffa637e94bb9aff7b85d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 19 Aug 2023 12:13:43 +0200 Subject: [PATCH 02/16] chore(release): 0.9.0 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- run-backup.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e90688..ee8aa4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kopia", - "version": "0.8.2", + "version": "0.9.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kopia", - "version": "0.8.2", + "version": "0.9.0", "devDependencies": { "@semantic-release/git": "^10.0.1", "semantic-release": "^21.0.2" diff --git a/package.json b/package.json index 43b768e..e0dc52d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kopia", - "version": "0.8.2", + "version": "0.9.0", "private": true, "devDependencies": { "@semantic-release/git": "^10.0.1", diff --git a/run-backup.sh b/run-backup.sh index 6ba1679..3c9ccd9 100755 --- a/run-backup.sh +++ b/run-backup.sh @@ -24,6 +24,6 @@ kopia repository connect filesystem \ --override-hostname ${KOPIA_HOSTNAME} \ --override-username ${KOPIA_USERNAME} -kopia snapshot create /backup +kopia snapshot create ${KOPIA_BACKUP_PATH} echo "Finished backup at $(date)" From 9547f357ce4445b50b2da59f54fbcbf0e1b479cc Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 24 Aug 2023 10:58:04 +0200 Subject: [PATCH 03/16] feat: enable ftp backups --- Dockerfile | 2 +- run-backup.sh | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 437d393..982aebe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM kopia/kopia ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y cron postgresql-client && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y cron postgresql-client lftp && rm -rf /var/lib/apt/lists/* ARG KOPIA_CRON_SCHEDULE ENV KOPIA_CRON_SCHEDULE ${KOPIA_CRON_SCHEDULE} diff --git a/run-backup.sh b/run-backup.sh index 3c9ccd9..13f6890 100755 --- a/run-backup.sh +++ b/run-backup.sh @@ -8,17 +8,13 @@ then PGPASSWORD=$KOPIA_PG_PASSWORD pg_dump --host=$KOPIA_PG_HOST --username=$KOPIA_PG_USER $KOPIA_PG_DATABASE > /backup/database/$KOPIA_PG_DATABASE.sqldump || exit 1 fi -# if [[ -v KOPIA_FTP_HOST ]]; -# then -# echo "Downloading from ftp server ${KOPIA_FTP_HOST}" -# -# lftp -u "$KOPIA_FTP_USER","$KOPIA_FTP_PASSWORD" $KOPIA_FTP_HOST < Date: Thu, 24 Aug 2023 11:00:52 +0200 Subject: [PATCH 04/16] chore(release): 0.10.0 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee8aa4d..498c92e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kopia", - "version": "0.9.0", + "version": "0.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kopia", - "version": "0.9.0", + "version": "0.10.0", "devDependencies": { "@semantic-release/git": "^10.0.1", "semantic-release": "^21.0.2" diff --git a/package.json b/package.json index e0dc52d..76e7a87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kopia", - "version": "0.9.0", + "version": "0.10.0", "private": true, "devDependencies": { "@semantic-release/git": "^10.0.1", From 62d0aeda3a85d1faa85d0ec7fc622b3d2ed8f7aa Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sun, 17 Sep 2023 10:33:00 +0200 Subject: [PATCH 05/16] feat: upgrade to kopia 0.14 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 982aebe..1ca8fe2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kopia/kopia +FROM kopia/kopia:0.14 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y cron postgresql-client lftp && rm -rf /var/lib/apt/lists/* From bde4645527e37b66fd476879cf9f933904892efa Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 17 Sep 2023 10:33:20 +0200 Subject: [PATCH 06/16] chore(release): 0.11.0 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 498c92e..e0e3613 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kopia", - "version": "0.10.0", + "version": "0.11.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kopia", - "version": "0.10.0", + "version": "0.11.0", "devDependencies": { "@semantic-release/git": "^10.0.1", "semantic-release": "^21.0.2" diff --git a/package.json b/package.json index 76e7a87..bc9e709 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kopia", - "version": "0.10.0", + "version": "0.11.0", "private": true, "devDependencies": { "@semantic-release/git": "^10.0.1", From 6625f052ac5267cfa31339138f0b927be0be27d6 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 29 Feb 2024 09:45:42 +0100 Subject: [PATCH 07/16] 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 1058284..b8306c4 100644 --- a/.nix/flake.lock +++ b/.nix/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692190437, - "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=", + "lastModified": 1709169036, + "narHash": "sha256-j+ywPKUS0JLpidNcz6vA0z1xI/rU5PcLV7pwZMce+Tw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5", + "rev": "ec25c90d35d24e36c0af3b3d58a09542367ebbee", "type": "github" }, "original": { From 83f20d76c4c083fadda097f2679e9c9401f7d77b Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 29 Feb 2024 09:47:16 +0100 Subject: [PATCH 08/16] feat: update to kopia 0.15.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1ca8fe2..9907068 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kopia/kopia:0.14 +FROM kopia/kopia:0.15.0 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y cron postgresql-client lftp && rm -rf /var/lib/apt/lists/* From 79c69793b89605b26f79cbd13bab958786440c3d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 29 Feb 2024 10:51:21 +0100 Subject: [PATCH 09/16] chore(release): 0.12.0 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0e3613..ec975dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kopia", - "version": "0.11.0", + "version": "0.12.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kopia", - "version": "0.11.0", + "version": "0.12.0", "devDependencies": { "@semantic-release/git": "^10.0.1", "semantic-release": "^21.0.2" diff --git a/package.json b/package.json index bc9e709..df22de2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kopia", - "version": "0.11.0", + "version": "0.12.0", "private": true, "devDependencies": { "@semantic-release/git": "^10.0.1", From 786e1b5fc4dd743daaff4a6955aaa7033da5a5e7 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 29 Feb 2024 10:53:30 +0100 Subject: [PATCH 10/16] build: fix current semantic-release compatibility --- build-and-push.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build-and-push.sh b/build-and-push.sh index dc606f2..00d2b1e 100755 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -1,9 +1,12 @@ #!/usr/bin/env sh -SKIP=no-commit-to-branch,prettier CI=false npx semantic-release +SKIP=no-commit-to-branch,prettier CI=false npx --package semantic-release --package @semantic-release/git semantic-release -VERSION=`npx semantic-release --version` +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 . + +docker login git.molez.org + docker image push git.molez.org/mandlm/kopia:${VERSION} docker image push git.molez.org/mandlm/kopia:latest From 2e54c4f3a74a66a4bdf3f47bf1de0baedb191a0d Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Mon, 4 Mar 2024 14:47:42 +0100 Subject: [PATCH 11/16] feat: upgrade to postgresql 15 --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9907068..ad91151 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ FROM kopia/kopia:0.15.0 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y cron postgresql-client lftp && rm -rf /var/lib/apt/lists/* +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/* ARG KOPIA_CRON_SCHEDULE ENV KOPIA_CRON_SCHEDULE ${KOPIA_CRON_SCHEDULE} From d49df9490b0b0f930bfcccd86e9376a4bbee96d6 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 4 Mar 2024 14:48:12 +0100 Subject: [PATCH 12/16] chore(release): 0.13.0 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec975dc..83f7f49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kopia", - "version": "0.12.0", + "version": "0.13.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kopia", - "version": "0.12.0", + "version": "0.13.0", "devDependencies": { "@semantic-release/git": "^10.0.1", "semantic-release": "^21.0.2" diff --git a/package.json b/package.json index df22de2..207c81b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kopia", - "version": "0.12.0", + "version": "0.13.0", "private": true, "devDependencies": { "@semantic-release/git": "^10.0.1", From 50438b473719b1bc032ad989ac5b2dac6a9915ec Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sun, 15 Dec 2024 20:05:57 +0100 Subject: [PATCH 13/16] feat: update to kopia 0.18 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad91151..63b074f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kopia/kopia:0.15.0 +FROM kopia/kopia:0.18 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y gnupg2 wget lsb-release From fa9e1e452684bf07f0889390cce45af2f85e03bd Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 15 Dec 2024 20:06:34 +0100 Subject: [PATCH 14/16] chore(release): 0.14.0 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83f7f49..7e6b343 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "kopia", - "version": "0.13.0", + "version": "0.14.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kopia", - "version": "0.13.0", + "version": "0.14.0", "devDependencies": { "@semantic-release/git": "^10.0.1", "semantic-release": "^21.0.2" diff --git a/package.json b/package.json index 207c81b..e2046fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kopia", - "version": "0.13.0", + "version": "0.14.0", "private": true, "devDependencies": { "@semantic-release/git": "^10.0.1", From 32c2b63775a870f94288d791ef8e0a6c92522345 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sat, 1 Feb 2025 12:44:25 +0100 Subject: [PATCH 15/16] 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 16/16] 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": {