From 65847a6b2a2bd656ed0f6c4aba61dd869a5069cd Mon Sep 17 00:00:00 2001 From: Ollie Date: Fri, 15 May 2026 09:22:10 +0100 Subject: [PATCH 1/2] DNM: Remove mariadb-client from Dockerfile Also, TEMPORARILY change the `docker.build.yml` GitHub action so the image is built and pushed on PR creation as well. Bug: T426216 --- .github/workflows/docker.build.yml | 3 +-- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml index 51990549d..05a71f309 100644 --- a/.github/workflows/docker.build.yml +++ b/.github/workflows/docker.build.yml @@ -39,7 +39,6 @@ jobs: ${{ runner.os }}-buildx- - name: Login to GitHub Container Registry uses: docker/login-action@v3.6.0 - if: github.event_name != 'pull_request' with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -52,7 +51,7 @@ jobs: platforms: linux/amd64 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,mode=max,dest=/tmp/.buildx-cache - push: ${{ github.event_name != 'pull_request' }} + push: true tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} - name: Check out `wmde/wbaas-deploy` repository in staging child directory diff --git a/Dockerfile b/Dockerfile index 302fc69b1..5b63a1b48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM php:8.2-apache RUN apt-get update \ # Needed for the imagick php extension install - && apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev mariadb-client\ + && apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev \ && echo "" | pecl install imagick redis \ && docker-php-ext-enable imagick \ && docker-php-ext-enable redis \ From 14abc904350c34431641c71ae3b65c0c5bd15113 Mon Sep 17 00:00:00 2001 From: Ollie Date: Fri, 15 May 2026 13:30:52 +0100 Subject: [PATCH 2/2] DNM: Build image with `docker.mysql.cnf` config added to Dockerfile In order to test in minikube --- Dockerfile | 5 ++++- docker.my.cnf => docker.mysql.cnf | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename docker.my.cnf => docker.mysql.cnf (100%) diff --git a/Dockerfile b/Dockerfile index 5b63a1b48..5fb67fc98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM php:8.2-apache RUN apt-get update \ # Needed for the imagick php extension install - && apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev \ + && apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev mariadb-client \ && echo "" | pecl install imagick redis \ && docker-php-ext-enable imagick \ && docker-php-ext-enable redis \ @@ -40,6 +40,9 @@ RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-av COPY --chown=www-data:www-data --from=composer /tmp/src2 /var/www/html +# Copy custom mysql config file to the container to set the `skip-ssl` option. +COPY ./docker.mysql.cnf /etc/mysql/conf.d/docker.mysql.cnf + WORKDIR /var/www/html COPY ./start.sh /usr/local/bin/start diff --git a/docker.my.cnf b/docker.mysql.cnf similarity index 100% rename from docker.my.cnf rename to docker.mysql.cnf