Update to the latest release of Backdrop CMS - 1.33.2#21347
Update to the latest release of Backdrop CMS - 1.33.2#21347Wylbur wants to merge 6 commits intodocker-library:masterfrom
Conversation
Latest Updates
Diff for e83036a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e8e06b3..d3241b9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
Maintainers: Mike Pirog <mike@kalabox.io> (@pirog), Geoff St. Pierre <serundeputy@gmail.com> (@serundeputy), Jen Lampton <jen+docker@jeneration.com> (@jenlampton), Greg Netsas <greg@userfriendly.tech> (@klonos)
GitRepo: https://github.com/backdrop-ops/backdrop-docker.git
-Tags: 1.33.0, 1.33, 1, 1.33.0-apache, 1.33-apache, 1-apache, apache, latest
+Tags: 1.33.2, 1.33, 1, 1.33.2-apache, 1.33-apache, 1-apache, apache, latest
Architectures: amd64, arm64v8
-GitCommit: 7507205f204226257a3686d581f2a44efa4c998c
+GitCommit: 634221177b8580c59b1ee71423bdd535c11a35bb
Directory: 1/apache
-Tags: 1.33.0-fpm, 1.33-fpm, 1-fpm, fpm
+Tags: 1.33.2-fpm, 1.33-fpm, 1-fpm, fpm
Architectures: amd64, arm64v8
-GitCommit: 7507205f204226257a3686d581f2a44efa4c998c
+GitCommit: 634221177b8580c59b1ee71423bdd535c11a35bb
Directory: 1/fpm
diff --git a/_bashbrew-list b/_bashbrew-list
index 773f8f4..295738c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,9 +4,9 @@ backdrop:1-fpm
backdrop:1.33
backdrop:1.33-apache
backdrop:1.33-fpm
-backdrop:1.33.0
-backdrop:1.33.0-apache
-backdrop:1.33.0-fpm
+backdrop:1.33.2
+backdrop:1.33.2-apache
+backdrop:1.33.2-fpm
backdrop:apache
backdrop:fpm
backdrop:latest
diff --git a/backdrop_fpm/Dockerfile b/backdrop_fpm/Dockerfile
index deea902..e7cb2da 100644
--- a/backdrop_fpm/Dockerfile
+++ b/backdrop_fpm/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y libzip-dev libonig-dev libpng-dev libjp
WORKDIR /var/www/html
# https://github.com/backdrop/backdrop/releases
-ENV BACKDROP_VERSION=1.33.0
-ENV BACKDROP_MD5=9b5e3fb6ac833e2adc2857f050d3f143
+ENV BACKDROP_VERSION=1.33.2
+ENV BACKDROP_MD5=b7e7aa755f98e625267f56290ba6f449
RUN curl -fSL "https://github.com/backdrop/backdrop/archive/${BACKDROP_VERSION}.tar.gz" -o backdrop.tar.gz \
&& echo "${BACKDROP_MD5} *backdrop.tar.gz" | md5sum -c - \
diff --git a/backdrop_latest/Dockerfile b/backdrop_latest/Dockerfile
index 242f6f3..c87edaf 100644
--- a/backdrop_latest/Dockerfile
+++ b/backdrop_latest/Dockerfile
@@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends libzip-dev libo
WORKDIR /var/www/html
# https://github.com/backdrop/backdrop/releases
-ENV BACKDROP_VERSION=1.33.0
-ENV BACKDROP_MD5=9b5e3fb6ac833e2adc2857f050d3f143
+ENV BACKDROP_VERSION=1.33.2
+ENV BACKDROP_MD5=b7e7aa755f98e625267f56290ba6f449
RUN curl -fSL "https://github.com/backdrop/backdrop/archive/refs/tags/${BACKDROP_VERSION}.tar.gz" -o backdrop.tar.gz \
&& echo "${BACKDROP_MD5} *backdrop.tar.gz" | md5sum -c - \Relevant Maintainers:
|
tianon
left a comment
There was a problem hiding this comment.
As a heads-up -- this predates the PR, so not a condition of merge -- the backdrop_fpm/Dockerfile is missing --no-install-recommends in its apt-get install step while backdrop_latest has it:
# backdrop_fpm/Dockerfile
RUN apt-get update && apt-get install -y libzip-dev libonig-dev libpng-dev libjpeg...
# backdrop_latest/Dockerfile
RUN apt-get update && apt-get install -y --no-install-recommends libzip-dev libonig-dev libpng-dev libjpeg...Worth aligning the two variants at some point. 🙈
This PR has 6 commits, most of which are merge commits from syncing your fork with upstream -- ideally a change like this would just be the one commit. Two ways to handle this:
-
Fix this PR: rebase onto upstream
masterand force-push:git fetch https://github.com/docker-library/official-images.git master git rebase FETCH_HEAD git push --force-with-lease origin <your-branch>
-
For future PRs: rather than working from your fork's
master(which accumulates these merge commits as you sync), branch directly off upstreammaster:git fetch https://github.com/docker-library/official-images.git master git checkout -b my-change FETCH_HEAD # make your change, then: git push origin my-change
(If you have a named remote pointing at the upstream repo, you can use that instead of the full URL -- whatever is most convenient for your local setup.)
Either way keeps the PR history clean and makes the actual change much easier to review. 😅
Update backdrop to 1.33.2
Here's the latest release of Backdrop:
https://github.com/backdrop/backdrop/releases/tag/1.33.2
Here's the latest commit to backdrop-docker repo
https://github.com/backdrop-ops/backdrop-docker/commits/master