Skip to content

DNM: Remove mariadb-client from Dockerfile #1128

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.

Sign up for GitHub

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

Closed
outdooracorn wants to merge 2 commits into from
Closed

DNM: Remove mariadb-client from Dockerfile #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65847a6
DNM: Remove mariadb-client from Dockerfile
outdooracorn May 15, 2026
14abc90
DNM: Build image with `docker.mysql.cnf` config added to Dockerfile
outdooracorn May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/docker.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM composer:2.3 as composer

Check warning on line 1 in Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY ./composer.json /tmp/src1/composer.json
COPY ./composer.lock /tmp/src1/composer.lock
Expand All @@ -16,7 +16,7 @@

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 mariadb-client \
&& echo "" | pecl install imagick redis \
&& docker-php-ext-enable imagick \
&& docker-php-ext-enable redis \
Expand All @@ -32,7 +32,7 @@
&& docker-php-ext-enable opencensus \
&& rm -rf /var/lib/apt/lists/*

ENV APACHE_DOCUMENT_ROOT /var/www/html/public

Check warning on line 35 in Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# Change the document root
RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
Expand All @@ -40,6 +40,9 @@

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
Expand Down
0 docker.my.cnf → docker.mysql.cnf
View file
Open in desktop
File renamed without changes.
Loading