Update backdrop

[Wylbur]

Update to 1.21.3

Here's the latest release info
https://github.com/backdrop/backdrop/releases/tag/1.21.3
backdrop-ops/backdrop-docker@5ff119d

[tianon]

configure: error: unrecognized options: --with-png-dir, --with-jpeg-dir

I think these can change to just --with-png and --with-jpeg on the newer PHP version. 👍

Edit: for example, https://github.com/docker-library/wordpress/blob/8874538f8ac8e2adc0beac9ab5e637a823addf3b/latest/php7.4/apache/Dockerfile#L34-L38 👀

[Wylbur]

@tianon
I have updated master branch with updates to those arguments. How do we restart this?

[tianon]

Just update GitCommit: to point to the new commit and the CI will re-run. 👍

[drupol]

Hi,

Could you please remove me from the maintainers? (Line 4 of this file)

Thanks :)

[drupol]

Thanks !

[tianon]

Looks like it might be worth setting up a basic GitHub Action over in https://github.com/backdrop-ops/backdrop-docker to at least do a docker build. 😅

[github-actions]

Diff for f1a7b8a:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 439560d..4f75241 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), Pol Dellaiera <pol.dellaiera@protonmail.com> (@drupol), Greg Netsas <greg@userfriendly.tech> (@klonos)
+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.17.3, 1.17, 1, 1.17.3-apache, 1.17-apache, 1-apache, apache, latest
+Tags: 1.21.3, 1.21, 1, 1.21.3-apache, 1.21-apache, 1-apache, apache, latest
 Architectures: amd64, arm64v8
-GitCommit: b760ba970a67f3dcdc975ed8b77f915895184577
+GitCommit: 458205ef1ece9f624aacfd105fcea82d21277812
 Directory: 1/apache
 
-Tags: 1.17.3-fpm, 1.17-fpm, 1-fpm, fpm
+Tags: 1.21.3-fpm, 1.21-fpm, 1-fpm, fpm
 Architectures: amd64, arm64v8
-GitCommit: b760ba970a67f3dcdc975ed8b77f915895184577
+GitCommit: 458205ef1ece9f624aacfd105fcea82d21277812
 Directory: 1/fpm
diff --git a/_bashbrew-list b/_bashbrew-list
index e0ea526..5469051 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
 backdrop:1
 backdrop:1-apache
 backdrop:1-fpm
-backdrop:1.17
-backdrop:1.17-apache
-backdrop:1.17-fpm
-backdrop:1.17.3
-backdrop:1.17.3-apache
-backdrop:1.17.3-fpm
+backdrop:1.21
+backdrop:1.21-apache
+backdrop:1.21-fpm
+backdrop:1.21.3
+backdrop:1.21.3-apache
+backdrop:1.21.3-fpm
 backdrop:apache
 backdrop:fpm
 backdrop:latest
diff --git a/backdrop_fpm/Dockerfile b/backdrop_fpm/Dockerfile
index 5147fed..631d908 100644
--- a/backdrop_fpm/Dockerfile
+++ b/backdrop_fpm/Dockerfile
@@ -1,17 +1,17 @@
 # from https://backdropcms.org/requirements
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 
 # install the PHP extensions we need
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev \
+RUN apt-get update && apt-get install -y libzip libonig-dev libpng-dev libjpeg-dev libpq-dev \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-configure gd --with-jpeg=/usr \
 	&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
 
 WORKDIR /var/www/html
 
 # https://github.com/backdrop/backdrop/releases
-ENV BACKDROP_VERSION 1.17.3
-ENV BACKDROP_MD5 907ae2978936d525626dd4c981afd0d2
+ENV BACKDROP_VERSION 1.21.3
+ENV BACKDROP_MD5 a93fe043630a617f6ae0977aaae3e919
 
 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 0f437c2..7bb0115 100644
--- a/backdrop_latest/Dockerfile
+++ b/backdrop_latest/Dockerfile
@@ -1,19 +1,19 @@
 # from https://backdropcms.org/requirements
-FROM php:7.2-apache
+FROM php:7.4-apache
 
 RUN a2enmod rewrite
 
 # install the PHP extensions we need
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libpq-dev \
+RUN apt-get update && apt-get install -y libzip libonig-dev libpng-dev libjpeg-dev libpq-dev \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-configure gd --with-jpeg=/usr \
 	&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
 
 WORKDIR /var/www/html
 
 # https://github.com/backdrop/backdrop/releases
-ENV BACKDROP_VERSION 1.17.3
-ENV BACKDROP_MD5 907ae2978936d525626dd4c981afd0d2
+ENV BACKDROP_VERSION 1.21.3
+ENV BACKDROP_MD5 a93fe043630a617f6ae0977aaae3e919
 
 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 - \

Relevant Maintainers:

• backdrop: @pirog @serundeputy @jenlampton @drupol @klonos

[tianon]

Something like this in .github/workflows/ci.yml is probably a "good enough" start: 😉 😬

name: CI

on:
  pull_request:
  push:

jobs:
  test:
    name: Test
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - run: docker build 1/apache
      - run: docker build 1/fpm

(Then you won't have to wait for us to "Approve and run" here, and could remove that now-defunct .travis.yml file that used to do something very similar.)

[Wylbur]

We have rebuild the review process, thanks for all your very helpful input!