diff --git a/.circleci/config.yml b/.circleci/config.yml index 74b682fb0..d6c48ca2d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -133,7 +133,7 @@ aliases: # This container has all the necessary tools to run a dockerized environment. # @see https://github.com/drevops/ci-runner # @see https://hub.docker.com/repository/docker/drevops/ci-runner/tags?page=1&ordering=last_updated - - image: drevops/ci-runner:23.12.0 + - image: drevops/ci-runner:24.1.0 auth: username: $DOCKER_USER password: $DOCKER_PASS diff --git a/.docker/cli.dockerfile b/.docker/cli.dockerfile index f63f21330..0a6e0eec2 100644 --- a/.docker/cli.dockerfile +++ b/.docker/cli.dockerfile @@ -4,7 +4,7 @@ # # @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal -FROM uselagoon/php-8.2-cli-drupal:23.12.0 +FROM uselagoon/php-8.2-cli-drupal:24.1.0 # Add missing variables. # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved. @@ -38,7 +38,7 @@ ENV WEBROOT=${WEBROOT} \ # reduce build time. # Adding more tools. -RUN apk add --no-cache ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023d-r0 +RUN apk add --no-cache ncurses=6.4_p20231125-r0 pv=1.8.5-r0 tzdata=2024a-r0 # Adding patches and scripts. COPY patches /app/patches diff --git a/.docker/mariadb.dockerfile b/.docker/mariadb.dockerfile index c82fc5f66..bf6c643a0 100644 --- a/.docker/mariadb.dockerfile +++ b/.docker/mariadb.dockerfile @@ -8,7 +8,7 @@ # @see https://github.com/drevops/mariadb-drupal-data # # The ARG value will be updated with a value passed from docker-compose.yml -ARG IMAGE=uselagoon/mariadb-drupal:23.12.0 +ARG IMAGE=uselagoon/mariadb-drupal:24.1.0 # hadolint ignore=DL3006 FROM ${IMAGE} diff --git a/.docker/nginx-drupal.dockerfile b/.docker/nginx-drupal.dockerfile index a9b88809f..153ae1f3a 100644 --- a/.docker/nginx-drupal.dockerfile +++ b/.docker/nginx-drupal.dockerfile @@ -7,12 +7,12 @@ FROM ${CLI_IMAGE:-cli} as cli # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags?page=1 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal -FROM uselagoon/nginx-drupal:23.12.0 +FROM uselagoon/nginx-drupal:24.1.0 # Webroot is used for Nginx docroot configuration. ARG WEBROOT=web ENV WEBROOT=${WEBROOT} -RUN apk add --no-cache tzdata=2023d-r0 +RUN apk add --no-cache tzdata=2024a-r0 COPY --from=cli /app /app diff --git a/.docker/php.dockerfile b/.docker/php.dockerfile index c4f39a786..e0fcb07dc 100644 --- a/.docker/php.dockerfile +++ b/.docker/php.dockerfile @@ -8,8 +8,8 @@ FROM ${CLI_IMAGE:-cli} as cli # @see https://hub.docker.com/r/uselagoon/php-8.2-fpm/tags # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm -FROM uselagoon/php-8.2-fpm:23.12.0 +FROM uselagoon/php-8.2-fpm:24.1.0 -RUN apk add --no-cache tzdata=2023d-r0 +RUN apk add --no-cache tzdata=2024a-r0 COPY --from=cli /app /app diff --git a/.docker/solr.dockerfile b/.docker/solr.dockerfile index abe222ea0..181e4a144 100644 --- a/.docker/solr.dockerfile +++ b/.docker/solr.dockerfile @@ -5,7 +5,7 @@ FROM ${CLI_IMAGE} as cli # @see https://hub.docker.com/r/uselagoon/solr-8/tags # @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile -FROM uselagoon/solr-8:23.12.0 +FROM uselagoon/solr-8:24.1.0 # Solr Jump-start config needs to be manually copied from search_api_solr module # /app/docroot/modules/contrib/search_api_solr/jump-start/solr8/config-set. diff --git a/.drevops/devtool/tests/phpunit/Fixtures/root_dir/.docker/cli.dockerfile b/.drevops/devtool/tests/phpunit/Fixtures/root_dir/.docker/cli.dockerfile index 9f9c78561..12bbb3bfd 100644 --- a/.drevops/devtool/tests/phpunit/Fixtures/root_dir/.docker/cli.dockerfile +++ b/.drevops/devtool/tests/phpunit/Fixtures/root_dir/.docker/cli.dockerfile @@ -4,7 +4,7 @@ # # @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal -FROM uselagoon/php-8.2-cli-drupal:23.12.0 +FROM uselagoon/php-8.2-cli-drupal:24.1.0 # Add missing variables. # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved. @@ -38,7 +38,7 @@ ENV WEBROOT=${WEBROOT} \ # reduce build time. # Adding more tools. -RUN apk add --no-cache ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023c-r1 +RUN apk add --no-cache ncurses=6.4_p20231125-r0 pv=1.8.5-r0 tzdata=2023c-r1 # Adding patches and scripts. COPY patches /app/patches diff --git a/.drevops/tests/bats/fixtures/docker-compose.env.json b/.drevops/tests/bats/fixtures/docker-compose.env.json index 837b5fb25..8789575bf 100644 --- a/.drevops/tests/bats/fixtures/docker-compose.env.json +++ b/.drevops/tests/bats/fixtures/docker-compose.env.json @@ -7,7 +7,6 @@ "name": "amazeeio-network" }, "default": { - "external": false, "ipam": [], "name": "star_wars_default" } @@ -409,15 +408,12 @@ }, "volumes": { "app": { - "external": false, "name": "star_wars_app" }, "files": { - "external": false, "name": "star_wars_files" }, "solr": { - "external": false, "name": "star_wars_solr" } } diff --git a/.drevops/tests/bats/fixtures/docker-compose.env_mod.json b/.drevops/tests/bats/fixtures/docker-compose.env_mod.json index 46ed0c28a..a3b711ceb 100644 --- a/.drevops/tests/bats/fixtures/docker-compose.env_mod.json +++ b/.drevops/tests/bats/fixtures/docker-compose.env_mod.json @@ -7,7 +7,6 @@ "name": "amazeeio-network" }, "default": { - "external": false, "ipam": [], "name": "the_matrix_default" } @@ -409,15 +408,12 @@ }, "volumes": { "app": { - "external": false, "name": "the_matrix_app" }, "files": { - "external": false, "name": "the_matrix_files" }, "solr": { - "external": false, "name": "the_matrix_solr" } } diff --git a/.drevops/tests/bats/fixtures/docker-compose.noenv.json b/.drevops/tests/bats/fixtures/docker-compose.noenv.json index dc6d056f8..043565c5e 100644 --- a/.drevops/tests/bats/fixtures/docker-compose.noenv.json +++ b/.drevops/tests/bats/fixtures/docker-compose.noenv.json @@ -7,7 +7,6 @@ "name": "amazeeio-network" }, "default": { - "external": false, "ipam": [], "name": "star_wars_default" } @@ -409,15 +408,12 @@ }, "volumes": { "app": { - "external": false, "name": "star_wars_app" }, "files": { - "external": false, "name": "star_wars_files" }, "solr": { - "external": false, "name": "star_wars_solr" } } diff --git a/docker-compose.yml b/docker-compose.yml index ed832b7a4..ee1d7ef9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -152,7 +152,7 @@ services: context: . dockerfile: .docker/mariadb.dockerfile args: - IMAGE: "${DREVOPS_DB_DOCKER_IMAGE:-uselagoon/mariadb-drupal:23.12.0}" # Use custom database image (if defined) or fallback to standard database image. + IMAGE: "${DREVOPS_DB_DOCKER_IMAGE:-uselagoon/mariadb-drupal:24.1.0}" # Use custom database image (if defined) or fallback to standard database image. <<: *default-user environment: <<: *default-environment @@ -165,7 +165,7 @@ services: #;< REDIS redis: - image: uselagoon/redis-6:23.12.0 + image: uselagoon/redis-6:24.1.0 #;< LAGOON labels: lagoon.type: redis # Change to 'none' if dedicated Redis service is used. See https://docs.lagoon.sh/using-lagoon-advanced/service-types/