From a7627f95f7880d4d9dc276518ef03f63fdce8c41 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 28 Jun 2021 23:01:20 +0200 Subject: [PATCH 1/7] Fix docker push --- .azure-pipelines/templates/release-jobs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure-pipelines/templates/release-jobs.yml b/.azure-pipelines/templates/release-jobs.yml index 0c6d653..85d76af 100644 --- a/.azure-pipelines/templates/release-jobs.yml +++ b/.azure-pipelines/templates/release-jobs.yml @@ -19,6 +19,9 @@ jobs: 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 displayName: Tag and push Docker images to DockerHub - job: github pool: From ef65acd8ce5b247001afdacf382bcf809b40571f Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 28 Jun 2021 23:02:18 +0200 Subject: [PATCH 2/7] Prepare changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0669834..6ac3544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT +### Modified +* Fix Docker images deployment ## 4.4.0-4 - 13/11/2020 ### Added From 629d286a521cc9601f26452a16822e00569f36ee Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 28 Jun 2021 23:02:26 +0200 Subject: [PATCH 3/7] Version 4.4.0-5 --- CHANGELOG.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ac3544..8c054d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT + +## 4.4.0-5 - 28/06/2021 ### Modified * Fix Docker images deployment diff --git a/VERSION b/VERSION index 2010045..d20222a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.0-4 \ No newline at end of file +4.4.0-5 \ No newline at end of file From ec68e76cd191c5b3f856fb96cf489d1c9e96ca8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 23:07:56 +0200 Subject: [PATCH 4/7] Bump alpine from 3.12.1 to 3.14.0 (#57) Bumps alpine from 3.12.1 to 3.14.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ffc8308..cfeb167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12.1 +FROM alpine:3.14.0 LABEL maintainer="Adrien Ferrand " From b23f2a91c7726c5df91b7727abdec02ff2b97028 Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 28 Jun 2021 23:32:33 +0200 Subject: [PATCH 5/7] Ensure Lighttpd loads `mod_openssl` when `USE_SSL=true` (#56) Fixes #55 --- files/entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/files/entrypoint.sh b/files/entrypoint.sh index 997052e..dd38dd7 100755 --- a/files/entrypoint.sh +++ b/files/entrypoint.sh @@ -87,6 +87,7 @@ if [ -f /firstrun ]; then # Reconfigure lighttpd to use ssl echo "ssl.engine = \"enable\"" >> /etc/lighttpd/lighttpd.conf echo "ssl.pemfile = \"/etc/lighttpd/server.pem\"" >> /etc/lighttpd/lighttpd.conf + sed -i -r '/^server\.modules/s# \)#, "mod_openssl" \)#' /etc/lighttpd/lighttpd.conf fi if [ "$AUTH_METHOD" == "ldap" ]; then From 13f66477daaafb0331b77439e234a03a02c9abb2 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 28 Jun 2021 23:34:38 +0200 Subject: [PATCH 6/7] Prepare changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c054d8..6de45c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## master - CURRENT +### Modified +* Update base image to Alpine 3.14.0 +* Explicitly enable `mod_openssl` lighttpd module when TLS is enabled (#56) ## 4.4.0-5 - 28/06/2021 ### Modified From 1f59dae53ac44e57d41d635aa1a65bc3b5d0cae2 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 28 Jun 2021 23:34:49 +0200 Subject: [PATCH 7/7] Version 4.4.0-6 --- CHANGELOG.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6de45c4..503a707 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT + +## 4.4.0-6 - 28/06/2021 ### Modified * Update base image to Alpine 3.14.0 * Explicitly enable `mod_openssl` lighttpd module when TLS is enabled (#56) diff --git a/VERSION b/VERSION index d20222a..1eae947 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.4.0-5 \ No newline at end of file +4.4.0-6 \ No newline at end of file