From 8998b054b8da20b9cee6f49336177f884fc28b3d Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 5 Aug 2021 00:08:08 +0200 Subject: [PATCH 01/19] Update rsync bpc to 3.1.3.0 --- CHANGELOG.md | 2 ++ Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 503a707..d7c2dab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT +### Modified +* Update rsync-bpc to 3.1.3.0 ## 4.4.0-6 - 28/06/2021 ### Modified diff --git a/Dockerfile b/Dockerfile index cfeb167..d28fed6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Adrien Ferrand " ENV BACKUPPC_VERSION 4.4.0 ENV BACKUPPC_XS_VERSION 0.62 -ENV RSYNC_BPC_VERSION 3.1.2.2 +ENV RSYNC_BPC_VERSION 3.1.3.0 ENV PAR2_VERSION v0.8.1 # Install backuppc runtime dependencies From 39fadf2ab03fb085f06f20b612c124f755ca73b3 Mon Sep 17 00:00:00 2001 From: AngusMcGyver <56880439+AngusMcGyver@users.noreply.github.com> Date: Thu, 5 Aug 2021 00:10:58 +0200 Subject: [PATCH 02/19] Update entrypoint.sh (#58) Fix for #47 https://github.com/adferrand/docker-backuppc/issues/47 --- files/entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/files/entrypoint.sh b/files/entrypoint.sh index dd38dd7..e9f5939 100755 --- a/files/entrypoint.sh +++ b/files/entrypoint.sh @@ -94,6 +94,7 @@ if [ -f /firstrun ]; then sed -i 's#LDAP_HOSTNAME#'"$LDAP_HOSTNAME"'#g' /etc/lighttpd/auth-ldap.conf sed -i 's#LDAP_BASE_DN#'"$LDAP_BASE_DN"'#g' /etc/lighttpd/auth-ldap.conf + LDAP_FILTER=$(sed 's#&#\\&#g' <<< "$LDAP_FILTER") sed -i 's#LDAP_FILTER#'"$LDAP_FILTER"'#g' /etc/lighttpd/auth-ldap.conf sed -i 's#LDAP_BIND_DN#'"$LDAP_BIND_DN"'#g' /etc/lighttpd/auth-ldap.conf sed -i 's#LDAP_BIND_PW#'"$LDAP_BIND_PW"'#g' /etc/lighttpd/auth-ldap.conf From 9942d46c39c9070973252bb54bf911a293892eed Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 5 Aug 2021 00:11:49 +0200 Subject: [PATCH 03/19] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7c2dab..997e1f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## master - CURRENT ### Modified * Update rsync-bpc to 3.1.3.0 +* Fix processing of LDAP filter from environment variables (#58) ## 4.4.0-6 - 28/06/2021 ### Modified From 359b7ec72d72ef92546783449141305d97141262 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 5 Aug 2021 00:12:11 +0200 Subject: [PATCH 04/19] Version 4.4.0-7 --- CHANGELOG.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 997e1f3..9c62f29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT + +## 4.4.0-7 - 05/08/2021 ### Modified * Update rsync-bpc to 3.1.3.0 * Fix processing of LDAP filter from environment variables (#58) diff --git a/VERSION b/VERSION index 1eae947..b680d41 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.0-6 \ No newline at end of file +4.4.0-7 \ No newline at end of file From c49b580ae069c772c5a0405a8a3a51ed0f105a55 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 16:57:50 +0200 Subject: [PATCH 05/19] Multiarch --- .azure-pipelines/templates/release-jobs.yml | 25 ++++++--------------- Dockerfile | 2 +- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.azure-pipelines/templates/release-jobs.yml b/.azure-pipelines/templates/release-jobs.yml index 85d76af..db566c5 100644 --- a/.azure-pipelines/templates/release-jobs.yml +++ b/.azure-pipelines/templates/release-jobs.yml @@ -3,29 +3,25 @@ jobs: pool: vmImage: ubuntu-18.04 steps: - - task: DownloadPipelineArtifact@2 - inputs: - artifact: docker - path: $(Build.SourcesDirectory) - displayName: Retrieve Docker artifact - task: Docker@2 inputs: command: login containerRegistry: docker-hub displayName: Login to DockerHub - script: | - docker load < docker-backuppc.tar.gz + set -e + curl -fsSL get.docker.com -o get-docker.sh && sh get-docker.sh + export DOCKER_CLI_EXPERIMENTAL=enabled + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + docker buildx create --use VERSION=`cat VERSION` echo "Docker tag is: ${VERSION}" - docker tag adferrand/backuppc adferrand/backuppc:4 - docker tag adferrand/backuppc "adferrand/backuppc:${VERSION}" - docker push "adferrand/backuppc:${VERSION}" - docker push adferrand/backuppc:4 - docker push adferrand/backuppc + docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --tag adferrand/backuppc:${VERSION} --tag adferrand/backuppc:4 --tag adferrand/backuppc --push . displayName: Tag and push Docker images to DockerHub - job: github pool: vmImage: ubuntu-18.04 + dependsOn: docker steps: - task: UsePythonVersion@0 inputs: @@ -46,10 +42,3 @@ jobs: releaseNotesFile: $(Build.SourcesDirectory)/release_$(ReleaseVersion).md addChangeLog: false displayName: Create GitHub Release - - job: trigger_dockerhub - pool: - vmImage: ubuntu-18.04 - steps: - - script: | - curl -H "Content-Type: application/json" --data '{"docker_tag": "master"}' -X POST https://registry.hub.docker.com/u/adferrand/backuppc/trigger/$(DOCKERHUB_TRIGGER_ID)/ - displayName: Trigger DockerHub build diff --git a/Dockerfile b/Dockerfile index d28fed6..6f16334 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.0 +FROM alpine:3.14.2 LABEL maintainer="Adrien Ferrand " From ee31811342d99ba681dbb9abcbf88ad253727de0 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 17:00:06 +0200 Subject: [PATCH 06/19] Prepare changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c62f29..ffe9343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog ## master - CURRENT +### Added +* Docker image is now supporting multiple architectures: AMD64, ARM64 and ARMv7 + +### Modified +* Update base image to Alpine 3.14.2 ## 4.4.0-7 - 05/08/2021 ### Modified From 635d3a26bd3abaa89df5f00593e22618dda3f42c Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 17:00:29 +0200 Subject: [PATCH 07/19] Version 4.4.0-8 --- CHANGELOG.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffe9343..fb0d550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT + +## 4.4.0-8 - 10/10/2021 ### Added * Docker image is now supporting multiple architectures: AMD64, ARM64 and ARMv7 diff --git a/VERSION b/VERSION index b680d41..9c7dcc1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.0-7 \ No newline at end of file +4.4.0-8 \ No newline at end of file From 9e826a5039ddb3e94f741f5a90646bc7d2960a0f Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 17:08:50 +0200 Subject: [PATCH 08/19] Test docker buildx config --- .azure-pipelines/templates/integration-jobs.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/templates/integration-jobs.yml b/.azure-pipelines/templates/integration-jobs.yml index c7decd4..afdf528 100644 --- a/.azure-pipelines/templates/integration-jobs.yml +++ b/.azure-pipelines/templates/integration-jobs.yml @@ -1,12 +1,15 @@ jobs: - job: build pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - script: | - docker pull adferrand/backuppc || true - docker build --pull --cache-from adferrand/backuppc -t adferrand/backuppc . - docker save adferrand/backuppc | gzip -c -1 > $(Build.ArtifactStagingDirectory)/docker-backuppc.tar.gz + set -e + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + docker buildx create --use + VERSION=`cat VERSION` + echo "Docker tag is: ${VERSION}" + docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --tag adferrand/backuppc --output type=local,dest=test . displayName: Build container - task: PublishPipelineArtifact@1 inputs: From 7ef4eb00c903c77552649c43ee975a03c36b5d98 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 17:14:37 +0200 Subject: [PATCH 09/19] Align config --- .azure-pipelines/templates/integration-jobs.yml | 6 ++++-- .azure-pipelines/templates/release-jobs.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/templates/integration-jobs.yml b/.azure-pipelines/templates/integration-jobs.yml index afdf528..368d43a 100644 --- a/.azure-pipelines/templates/integration-jobs.yml +++ b/.azure-pipelines/templates/integration-jobs.yml @@ -5,11 +5,11 @@ jobs: steps: - script: | set -e - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker buildx create --use VERSION=`cat VERSION` echo "Docker tag is: ${VERSION}" - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --tag adferrand/backuppc --output type=local,dest=test . + docker buildx build --platform linux/amd64 --tag adferrand/backuppc --load . + docker save adferrand/backuppc | gzip -c -1 > $(Build.ArtifactStagingDirectory)/docker-backuppc.tar.gz displayName: Build container - task: PublishPipelineArtifact@1 inputs: @@ -27,6 +27,7 @@ jobs: path: $(Build.SourcesDirectory) displayName: Retrieve Docker artifact - script: | + set -e docker load < docker-backuppc.tar.gz mkdir -p ./bin curl -fsSL https://goss.rocks/install | GOSS_DST=./bin sh @@ -43,6 +44,7 @@ jobs: path: $(Build.SourcesDirectory) displayName: Retrieve Docker artifact - script: | + set -e docker load < docker-backuppc.tar.gz docker run --name backuppc-integration --detach -p 8080:8080 adferrand/backuppc sleep 5 diff --git a/.azure-pipelines/templates/release-jobs.yml b/.azure-pipelines/templates/release-jobs.yml index db566c5..431d3fc 100644 --- a/.azure-pipelines/templates/release-jobs.yml +++ b/.azure-pipelines/templates/release-jobs.yml @@ -10,8 +10,6 @@ jobs: displayName: Login to DockerHub - script: | set -e - curl -fsSL get.docker.com -o get-docker.sh && sh get-docker.sh - export DOCKER_CLI_EXPERIMENTAL=enabled docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker buildx create --use VERSION=`cat VERSION` @@ -29,11 +27,13 @@ jobs: addToPath: true displayName: Install Python - script: | + set -e VERSION=`cat VERSION` echo "Version is: $version" echo "##vso[task.setvariable variable=ReleaseVersion;]${VERSION}" displayName: Get version - script: | + set -e python utils/extract_changelog.py $(ReleaseVersion) > release_$(ReleaseVersion).md - task: GithubRelease@0 inputs: From 5b53d1b20ce1a3ea1631c6aa08c6eb7ac8cafd08 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 17:33:27 +0200 Subject: [PATCH 10/19] Use ubuntu 20.04 to build --- .azure-pipelines/templates/integration-jobs.yml | 4 ++-- .azure-pipelines/templates/release-jobs.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/templates/integration-jobs.yml b/.azure-pipelines/templates/integration-jobs.yml index 368d43a..ffe630d 100644 --- a/.azure-pipelines/templates/integration-jobs.yml +++ b/.azure-pipelines/templates/integration-jobs.yml @@ -19,7 +19,7 @@ jobs: - job: unit_tests dependsOn: build pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - task: DownloadPipelineArtifact@2 inputs: @@ -36,7 +36,7 @@ jobs: - job: integration_tests dependsOn: build pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - task: DownloadPipelineArtifact@2 inputs: diff --git a/.azure-pipelines/templates/release-jobs.yml b/.azure-pipelines/templates/release-jobs.yml index 431d3fc..77c9341 100644 --- a/.azure-pipelines/templates/release-jobs.yml +++ b/.azure-pipelines/templates/release-jobs.yml @@ -1,7 +1,7 @@ jobs: - job: docker pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - task: Docker@2 inputs: @@ -18,7 +18,7 @@ jobs: displayName: Tag and push Docker images to DockerHub - job: github pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 dependsOn: docker steps: - task: UsePythonVersion@0 From e6d8990e64f13a65e3d4355cabf802e4ec43e7e5 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Sun, 10 Oct 2021 17:39:05 +0200 Subject: [PATCH 11/19] Wait more --- .azure-pipelines/templates/integration-jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/templates/integration-jobs.yml b/.azure-pipelines/templates/integration-jobs.yml index ffe630d..19bf061 100644 --- a/.azure-pipelines/templates/integration-jobs.yml +++ b/.azure-pipelines/templates/integration-jobs.yml @@ -31,7 +31,7 @@ jobs: docker load < docker-backuppc.tar.gz mkdir -p ./bin curl -fsSL https://goss.rocks/install | GOSS_DST=./bin sh - GOSS_PATH=./bin/goss GOSS_SLEEP=2 GOSS_FILES_PATH=./tests ./bin/dgoss run adferrand/backuppc + GOSS_PATH=./bin/goss GOSS_SLEEP=5 GOSS_FILES_PATH=./tests ./bin/dgoss run adferrand/backuppc displayName: Run unit tests - job: integration_tests dependsOn: build From a452e980988c2a483be5c78b84b8c8fb01133365 Mon Sep 17 00:00:00 2001 From: Vladimir Buyanov <81759784+cl-bvl@users.noreply.github.com> Date: Mon, 11 Oct 2021 08:52:19 +0300 Subject: [PATCH 12/19] Pass components versions as param to docker build (#64) --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f16334..6eb717c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,13 @@ FROM alpine:3.14.2 LABEL maintainer="Adrien Ferrand " -ENV BACKUPPC_VERSION 4.4.0 -ENV BACKUPPC_XS_VERSION 0.62 -ENV RSYNC_BPC_VERSION 3.1.3.0 -ENV PAR2_VERSION v0.8.1 +ARG BACKUPPC_VERSION="4.4.0" +ARG BACKUPPC_XS_VERSION="0.62" +ARG RSYNC_BPC_VERSION="3.1.3.0" + +ENV BACKUPPC_VERSION="${BACKUPPC_VERSION}" +ENV BACKUPPC_XS_VERSION="${BACKUPPC_XS_VERSION}" +ENV RSYNC_BPC_VERSION="${RSYNC_BPC_VERSION}" # Install backuppc runtime dependencies RUN apk --no-cache --update add \ @@ -32,7 +35,7 @@ RUN apk --no-cache --update add \ && sed -i -e 's/^# Host \*/Host */g' /etc/ssh/ssh_config \ && sed -i -e 's/^# StrictHostKeyChecking ask/ StrictHostKeyChecking no/g' /etc/ssh/ssh_config \ # Get BackupPC, it will be installed at runtime to allow dynamic upgrade of existing config/pool - && curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/releases/download/$BACKUPPC_VERSION/BackupPC-$BACKUPPC_VERSION.tar.gz \ + && curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/archive/$BACKUPPC_VERSION.tar.gz \ # Prepare backuppc home && mkdir -p /home/backuppc && cd /home/backuppc \ # Mark the docker as not run yet, to allow entrypoint to do its stuff From 446e39401fb3d91447342e4b179d6e949720d7bf Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 11 Oct 2021 07:53:45 +0200 Subject: [PATCH 13/19] Test docker buildx config (#63) * Test docker buildx config * Align config * Use ubuntu 20.04 to build * Wait more --- .azure-pipelines/templates/integration-jobs.yml | 17 +++++++++++------ .azure-pipelines/templates/release-jobs.yml | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/templates/integration-jobs.yml b/.azure-pipelines/templates/integration-jobs.yml index c7decd4..19bf061 100644 --- a/.azure-pipelines/templates/integration-jobs.yml +++ b/.azure-pipelines/templates/integration-jobs.yml @@ -1,11 +1,14 @@ jobs: - job: build pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - script: | - docker pull adferrand/backuppc || true - docker build --pull --cache-from adferrand/backuppc -t adferrand/backuppc . + set -e + docker buildx create --use + VERSION=`cat VERSION` + echo "Docker tag is: ${VERSION}" + docker buildx build --platform linux/amd64 --tag adferrand/backuppc --load . docker save adferrand/backuppc | gzip -c -1 > $(Build.ArtifactStagingDirectory)/docker-backuppc.tar.gz displayName: Build container - task: PublishPipelineArtifact@1 @@ -16,7 +19,7 @@ jobs: - job: unit_tests dependsOn: build pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - task: DownloadPipelineArtifact@2 inputs: @@ -24,15 +27,16 @@ jobs: path: $(Build.SourcesDirectory) displayName: Retrieve Docker artifact - script: | + set -e docker load < docker-backuppc.tar.gz mkdir -p ./bin curl -fsSL https://goss.rocks/install | GOSS_DST=./bin sh - GOSS_PATH=./bin/goss GOSS_SLEEP=2 GOSS_FILES_PATH=./tests ./bin/dgoss run adferrand/backuppc + GOSS_PATH=./bin/goss GOSS_SLEEP=5 GOSS_FILES_PATH=./tests ./bin/dgoss run adferrand/backuppc displayName: Run unit tests - job: integration_tests dependsOn: build pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - task: DownloadPipelineArtifact@2 inputs: @@ -40,6 +44,7 @@ jobs: path: $(Build.SourcesDirectory) displayName: Retrieve Docker artifact - script: | + set -e docker load < docker-backuppc.tar.gz docker run --name backuppc-integration --detach -p 8080:8080 adferrand/backuppc sleep 5 diff --git a/.azure-pipelines/templates/release-jobs.yml b/.azure-pipelines/templates/release-jobs.yml index db566c5..77c9341 100644 --- a/.azure-pipelines/templates/release-jobs.yml +++ b/.azure-pipelines/templates/release-jobs.yml @@ -1,7 +1,7 @@ jobs: - job: docker pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 steps: - task: Docker@2 inputs: @@ -10,8 +10,6 @@ jobs: displayName: Login to DockerHub - script: | set -e - curl -fsSL get.docker.com -o get-docker.sh && sh get-docker.sh - export DOCKER_CLI_EXPERIMENTAL=enabled docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker buildx create --use VERSION=`cat VERSION` @@ -20,7 +18,7 @@ jobs: displayName: Tag and push Docker images to DockerHub - job: github pool: - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 dependsOn: docker steps: - task: UsePythonVersion@0 @@ -29,11 +27,13 @@ jobs: addToPath: true displayName: Install Python - script: | + set -e VERSION=`cat VERSION` echo "Version is: $version" echo "##vso[task.setvariable variable=ReleaseVersion;]${VERSION}" displayName: Get version - script: | + set -e python utils/extract_changelog.py $(ReleaseVersion) > release_$(ReleaseVersion).md - task: GithubRelease@0 inputs: From 06fb7db7e39d23348d99c986526b707f9cd12158 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 23 Dec 2021 10:41:21 +0100 Subject: [PATCH 14/19] Add pigz utility --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f16334..b8d32ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.2 +FROM alpine:3.15.0 LABEL maintainer="Adrien Ferrand " @@ -13,7 +13,8 @@ RUN apk --no-cache --update add \ supervisor \ perl perl-archive-zip perl-xml-rss perl-cgi perl-file-listing perl-json-xs \ expat samba-client iputils openssh openssl rrdtool ttf-dejavu \ - msmtp lighttpd lighttpd-mod_auth gzip apache2-utils tzdata libstdc++ libgomp \ + msmtp lighttpd lighttpd-mod_auth apache2-utils tzdata libstdc++ libgomp \ + gzip pigz \ && apk --no-cache --update -X http://dl-cdn.alpinelinux.org/alpine/edge/community add par2cmdline \ # Install backuppc build dependencies && apk --no-cache --update --virtual build-dependencies add \ From 0900e166407dc4fd4a4c6732b13d50c4ebafe3ec Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 23 Dec 2021 10:41:21 +0100 Subject: [PATCH 15/19] Add pigz utility --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6eb717c..76b0c6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.2 +FROM alpine:3.15.0 LABEL maintainer="Adrien Ferrand " @@ -16,7 +16,8 @@ RUN apk --no-cache --update add \ supervisor \ perl perl-archive-zip perl-xml-rss perl-cgi perl-file-listing perl-json-xs \ expat samba-client iputils openssh openssl rrdtool ttf-dejavu \ - msmtp lighttpd lighttpd-mod_auth gzip apache2-utils tzdata libstdc++ libgomp \ + msmtp lighttpd lighttpd-mod_auth apache2-utils tzdata libstdc++ libgomp \ + gzip pigz \ && apk --no-cache --update -X http://dl-cdn.alpinelinux.org/alpine/edge/community add par2cmdline \ # Install backuppc build dependencies && apk --no-cache --update --virtual build-dependencies add \ From fb5d764e1224bf9e0ed3c538373ef58dd57781cb Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 23 Dec 2021 11:09:28 +0100 Subject: [PATCH 16/19] Keep Alpine 3.14 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 76b0c6f..cf58e2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15.0 +FROM alpine:3.14.3 LABEL maintainer="Adrien Ferrand " From bf08a9d4cc4bbaa03cb32338758ac9be7c5047ee Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 23 Dec 2021 11:13:09 +0100 Subject: [PATCH 17/19] Change release download URL --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf58e2d..b2210b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.3 +FROM alpine:3.15.0 LABEL maintainer="Adrien Ferrand " @@ -36,7 +36,7 @@ RUN apk --no-cache --update add \ && sed -i -e 's/^# Host \*/Host */g' /etc/ssh/ssh_config \ && sed -i -e 's/^# StrictHostKeyChecking ask/ StrictHostKeyChecking no/g' /etc/ssh/ssh_config \ # Get BackupPC, it will be installed at runtime to allow dynamic upgrade of existing config/pool - && curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/archive/$BACKUPPC_VERSION.tar.gz \ + && curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/releases/download/$BACKUPPC_VERSION/BackupPC-$BACKUPPC_VERSION.tar.gz \ # Prepare backuppc home && mkdir -p /home/backuppc && cd /home/backuppc \ # Mark the docker as not run yet, to allow entrypoint to do its stuff From 14535f79693007c1ec8f6845ea57bcbcff0b0d1e Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 23 Dec 2021 11:15:55 +0100 Subject: [PATCH 18/19] Prepare changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb0d550..8e70bff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog ## master - CURRENT +### Added +* Provide `pigz` utility to do faster GZIP archives + +### Modified +* Update base image to Alpine 3.15.0 ## 4.4.0-8 - 10/10/2021 ### Added From abf846bc383f14ecac63134e65efa90500cc76d4 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Thu, 23 Dec 2021 11:16:25 +0100 Subject: [PATCH 19/19] Version 4.4.0-9 --- CHANGELOG.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e70bff..a090ca6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT + +## 4.4.0-9 - 23/12/2021 ### Added * Provide `pigz` utility to do faster GZIP archives diff --git a/VERSION b/VERSION index 9c7dcc1..a8d5c47 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.0-8 \ No newline at end of file +4.4.0-9 \ No newline at end of file