Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Backdrop, and update the CI Build process! #12013

Closed
wants to merge 3 commits into from

Conversation

Wylbur
Copy link
Contributor

@Wylbur Wylbur commented Mar 10, 2022

No description provided.

@github-actions
Copy link

Diff for d37558e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 439560d..df24abf 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
 Architectures: amd64, arm64v8
-GitCommit: b760ba970a67f3dcdc975ed8b77f915895184577
+GitCommit: c7e9301fd76e86e4bd7c6747dd51e78bc8400e60
 Directory: 1/apache
 
 Tags: 1.17.3-fpm, 1.17-fpm, 1-fpm, fpm
 Architectures: amd64, arm64v8
-GitCommit: b760ba970a67f3dcdc975ed8b77f915895184577
+GitCommit: c7e9301fd76e86e4bd7c6747dd51e78bc8400e60
 Directory: 1/fpm
diff --git a/backdrop_fpm/Dockerfile b/backdrop_fpm/Dockerfile
index 5147fed..ca1b4eb 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-dev 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..a15d147 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-dev 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:

@Wylbur Wylbur closed this Mar 10, 2022
@Wylbur Wylbur deleted the patch-2 branch December 7, 2022 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant