diff --git a/10.3-rc/php8.2/apache-bookworm/Dockerfile b/10.3/php8.2/apache-bookworm/Dockerfile similarity index 96% rename from 10.3-rc/php8.2/apache-bookworm/Dockerfile rename to 10.3/php8.2/apache-bookworm/Dockerfile index 79abb7b..10081c4 100644 --- a/10.3-rc/php8.2/apache-bookworm/Dockerfile +++ b/10.3/php8.2/apache-bookworm/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.2/apache-bookworm/apache2-pre-start-drupal b/10.3/php8.2/apache-bookworm/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.2/apache-bookworm/apache2-pre-start-drupal rename to 10.3/php8.2/apache-bookworm/apache2-pre-start-drupal diff --git a/10.3-rc/php8.2/apache-bullseye/Dockerfile b/10.3/php8.2/apache-bullseye/Dockerfile similarity index 96% rename from 10.3-rc/php8.2/apache-bullseye/Dockerfile rename to 10.3/php8.2/apache-bullseye/Dockerfile index 597a452..82fdf50 100644 --- a/10.3-rc/php8.2/apache-bullseye/Dockerfile +++ b/10.3/php8.2/apache-bullseye/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.2/apache-bullseye/apache2-pre-start-drupal b/10.3/php8.2/apache-bullseye/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.2/apache-bullseye/apache2-pre-start-drupal rename to 10.3/php8.2/apache-bullseye/apache2-pre-start-drupal diff --git a/10.3-rc/php8.2/fpm-alpine3.18/Dockerfile b/10.3/php8.2/fpm-alpine3.18/Dockerfile similarity index 95% rename from 10.3-rc/php8.2/fpm-alpine3.18/Dockerfile rename to 10.3/php8.2/fpm-alpine3.18/Dockerfile index 2c698e8..12941fc 100644 --- a/10.3-rc/php8.2/fpm-alpine3.18/Dockerfile +++ b/10.3/php8.2/fpm-alpine3.18/Dockerfile @@ -74,9 +74,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.2/fpm-alpine3.18/apache2-pre-start-drupal b/10.3/php8.2/fpm-alpine3.18/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.2/fpm-alpine3.18/apache2-pre-start-drupal rename to 10.3/php8.2/fpm-alpine3.18/apache2-pre-start-drupal diff --git a/10.3-rc/php8.2/fpm-alpine3.19/Dockerfile b/10.3/php8.2/fpm-alpine3.19/Dockerfile similarity index 95% rename from 10.3-rc/php8.2/fpm-alpine3.19/Dockerfile rename to 10.3/php8.2/fpm-alpine3.19/Dockerfile index 727466d..293366c 100644 --- a/10.3-rc/php8.2/fpm-alpine3.19/Dockerfile +++ b/10.3/php8.2/fpm-alpine3.19/Dockerfile @@ -74,9 +74,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.2/fpm-alpine3.19/apache2-pre-start-drupal b/10.3/php8.2/fpm-alpine3.19/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.2/fpm-alpine3.19/apache2-pre-start-drupal rename to 10.3/php8.2/fpm-alpine3.19/apache2-pre-start-drupal diff --git a/10.3-rc/php8.2/fpm-bookworm/Dockerfile b/10.3/php8.2/fpm-bookworm/Dockerfile similarity index 96% rename from 10.3-rc/php8.2/fpm-bookworm/Dockerfile rename to 10.3/php8.2/fpm-bookworm/Dockerfile index 5281447..fd04ef6 100644 --- a/10.3-rc/php8.2/fpm-bookworm/Dockerfile +++ b/10.3/php8.2/fpm-bookworm/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.2/fpm-bookworm/apache2-pre-start-drupal b/10.3/php8.2/fpm-bookworm/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.2/fpm-bookworm/apache2-pre-start-drupal rename to 10.3/php8.2/fpm-bookworm/apache2-pre-start-drupal diff --git a/10.3-rc/php8.2/fpm-bullseye/Dockerfile b/10.3/php8.2/fpm-bullseye/Dockerfile similarity index 96% rename from 10.3-rc/php8.2/fpm-bullseye/Dockerfile rename to 10.3/php8.2/fpm-bullseye/Dockerfile index fb0d6dd..bb402cd 100644 --- a/10.3-rc/php8.2/fpm-bullseye/Dockerfile +++ b/10.3/php8.2/fpm-bullseye/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.2/fpm-bullseye/apache2-pre-start-drupal b/10.3/php8.2/fpm-bullseye/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.2/fpm-bullseye/apache2-pre-start-drupal rename to 10.3/php8.2/fpm-bullseye/apache2-pre-start-drupal diff --git a/10.3-rc/php8.3/apache-bookworm/Dockerfile b/10.3/php8.3/apache-bookworm/Dockerfile similarity index 96% rename from 10.3-rc/php8.3/apache-bookworm/Dockerfile rename to 10.3/php8.3/apache-bookworm/Dockerfile index 7662d2e..a90ee41 100644 --- a/10.3-rc/php8.3/apache-bookworm/Dockerfile +++ b/10.3/php8.3/apache-bookworm/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.3/apache-bookworm/apache2-pre-start-drupal b/10.3/php8.3/apache-bookworm/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.3/apache-bookworm/apache2-pre-start-drupal rename to 10.3/php8.3/apache-bookworm/apache2-pre-start-drupal diff --git a/10.3-rc/php8.3/apache-bullseye/Dockerfile b/10.3/php8.3/apache-bullseye/Dockerfile similarity index 96% rename from 10.3-rc/php8.3/apache-bullseye/Dockerfile rename to 10.3/php8.3/apache-bullseye/Dockerfile index 84369e6..9a83926 100644 --- a/10.3-rc/php8.3/apache-bullseye/Dockerfile +++ b/10.3/php8.3/apache-bullseye/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.3/apache-bullseye/apache2-pre-start-drupal b/10.3/php8.3/apache-bullseye/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.3/apache-bullseye/apache2-pre-start-drupal rename to 10.3/php8.3/apache-bullseye/apache2-pre-start-drupal diff --git a/10.3-rc/php8.3/fpm-alpine3.18/Dockerfile b/10.3/php8.3/fpm-alpine3.18/Dockerfile similarity index 95% rename from 10.3-rc/php8.3/fpm-alpine3.18/Dockerfile rename to 10.3/php8.3/fpm-alpine3.18/Dockerfile index 46cbc89..2ca67e0 100644 --- a/10.3-rc/php8.3/fpm-alpine3.18/Dockerfile +++ b/10.3/php8.3/fpm-alpine3.18/Dockerfile @@ -74,9 +74,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.3/fpm-alpine3.18/apache2-pre-start-drupal b/10.3/php8.3/fpm-alpine3.18/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.3/fpm-alpine3.18/apache2-pre-start-drupal rename to 10.3/php8.3/fpm-alpine3.18/apache2-pre-start-drupal diff --git a/10.3-rc/php8.3/fpm-alpine3.19/Dockerfile b/10.3/php8.3/fpm-alpine3.19/Dockerfile similarity index 95% rename from 10.3-rc/php8.3/fpm-alpine3.19/Dockerfile rename to 10.3/php8.3/fpm-alpine3.19/Dockerfile index e8ceea8..98d7fa3 100644 --- a/10.3-rc/php8.3/fpm-alpine3.19/Dockerfile +++ b/10.3/php8.3/fpm-alpine3.19/Dockerfile @@ -74,9 +74,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.3/fpm-alpine3.19/apache2-pre-start-drupal b/10.3/php8.3/fpm-alpine3.19/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.3/fpm-alpine3.19/apache2-pre-start-drupal rename to 10.3/php8.3/fpm-alpine3.19/apache2-pre-start-drupal diff --git a/10.3-rc/php8.3/fpm-bookworm/Dockerfile b/10.3/php8.3/fpm-bookworm/Dockerfile similarity index 96% rename from 10.3-rc/php8.3/fpm-bookworm/Dockerfile rename to 10.3/php8.3/fpm-bookworm/Dockerfile index 6372c35..09f340c 100644 --- a/10.3-rc/php8.3/fpm-bookworm/Dockerfile +++ b/10.3/php8.3/fpm-bookworm/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.3/fpm-bookworm/apache2-pre-start-drupal b/10.3/php8.3/fpm-bookworm/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.3/fpm-bookworm/apache2-pre-start-drupal rename to 10.3/php8.3/fpm-bookworm/apache2-pre-start-drupal diff --git a/10.3-rc/php8.3/fpm-bullseye/Dockerfile b/10.3/php8.3/fpm-bullseye/Dockerfile similarity index 96% rename from 10.3-rc/php8.3/fpm-bullseye/Dockerfile rename to 10.3/php8.3/fpm-bullseye/Dockerfile index 29efa27..bf5d640 100644 --- a/10.3-rc/php8.3/fpm-bullseye/Dockerfile +++ b/10.3/php8.3/fpm-bullseye/Dockerfile @@ -91,9 +91,9 @@ RUN { \ COPY --from=composer:2 /usr/bin/composer /usr/local/bin/ ENV PATH=/usr/local/bin:${PATH} -# 2024-06-05: https://www.drupal.org/project/drupal/releases/10.3.0-rc1 -ENV DRUPAL_VERSION 10.3.0-rc1 -ENV DRUPAL_MD5 adc503e3b8abcccd2878b867f8575d44 +# 2024-06-20: https://www.drupal.org/project/drupal/releases/10.3.0 +ENV DRUPAL_VERSION 10.3.0 +ENV DRUPAL_MD5 39b263798ab4a0e2c7cee4138cb77296 ENV DRUSH_VERSION 12.4.3 ENV DRUPAL_COMPOSER_MODULES "" diff --git a/10.3-rc/php8.3/fpm-bullseye/apache2-pre-start-drupal b/10.3/php8.3/fpm-bullseye/apache2-pre-start-drupal similarity index 100% rename from 10.3-rc/php8.3/fpm-bullseye/apache2-pre-start-drupal rename to 10.3/php8.3/fpm-bullseye/apache2-pre-start-drupal diff --git a/README.md b/README.md index 2ff9442..b54d92e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ DRUPAL_COMPOSER_MODULES="drupal/ctools drupal/iframe" ENV DRUPAL_VERSION 10.1.8 ENV DRUPAL_VERSION 10.2.7 -ENV DRUPAL_VERSION 10.3.0-rc1 +ENV DRUPAL_VERSION 10.3.0 ENV DRUPAL_VERSION 11.0.0-beta1 ENV DRUPAL_VERSION 6.60 ENV DRUPAL_VERSION 7.101 diff --git a/build-and-push b/build-and-push index ca46f5e..156fe2e 100644 --- a/build-and-push +++ b/build-and-push @@ -9,6 +9,10 @@ docker build -t neffets/drupal:$VERSION -f 10.2/php8.2/apache-bookworm/Dockerfil docker push neffets/drupal:$VERSION docker tag neffets/drupal:$VERSION neffets/drupal:latest; docker push neffets/drupal:latest +VERSION="10.3-apache" +docker build -t neffets/drupal:$VERSION -f 10.3/php8.2/apache-bookworm/Dockerfile 10.3/php8.2/apache-bookworm/ +docker push neffets/drupal:$VERSION + VERSION="10.1-apache" docker build -t neffets/drupal:$VERSION -f 10.1/php8.2/apache-bookworm/Dockerfile 10.1/php8.2/apache-bookworm/ docker push neffets/drupal:$VERSION diff --git a/versions.json b/versions.json index 1708a62..5bd765d 100644 --- a/versions.json +++ b/versions.json @@ -25,12 +25,12 @@ } }, "11.0": null, - "10.3-rc": { - "version": "10.3.0-rc1", - "url": "https://ftp.drupal.org/files/projects/drupal-10.3.0-rc1.tar.gz", - "md5": "adc503e3b8abcccd2878b867f8575d44", - "date": 1717621189, - "notes": "https://www.drupal.org/project/drupal/releases/10.3.0-rc1", + "10.3": { + "version": "10.3.0", + "url": "https://ftp.drupal.org/files/projects/drupal-10.3.0.tar.gz", + "md5": "39b263798ab4a0e2c7cee4138cb77296", + "date": 1718911125, + "notes": "https://www.drupal.org/project/drupal/releases/10.3.0", "phpVersions": [ "8.3", "8.2" @@ -50,7 +50,6 @@ "version": "12.4.3" } }, - "10.3": null, "10.2": { "version": "10.2.7", "url": "https://ftp.drupal.org/files/projects/drupal-10.2.7.tar.gz", @@ -76,31 +75,6 @@ "version": "12.4.3" } }, - "10.1": { - "version": "10.1.8", - "url": "https://ftp.drupal.org/files/projects/drupal-10.1.8.tar.gz", - "md5": "2ea6f94091de2760908557dd3bb1956a", - "date": 1705512711, - "notes": "https://www.drupal.org/project/drupal/releases/10.1.8", - "phpVersions": [ - "8.2", - "8.1" - ], - "variants": [ - "apache-bookworm", - "fpm-bookworm", - "apache-bullseye", - "fpm-bullseye", - "fpm-alpine3.19", - "fpm-alpine3.18" - ], - "composer": { - "version": "2" - }, - "drush": { - "version": "11.4.0" - } - }, "7": { "version": "7.101", "url": "https://ftp.drupal.org/files/projects/drupal-7.101.tar.gz",