Skip to content

Commit 02b92c3

Browse files
Add mariadb client config to Dockerfile (#1129)
In order to prevent `TLS/SSL error: SSL is required, but the server does not support it` errors when running `php artisan migrate:install` as part of the `pre-install-job.yaml`[1] [1]: https://github.com/wbstack/charts/blob/89fbef289e239802cf991c70fb9a802d1719fe5a/charts/api/templates/pre-install-job.yaml#L39 Bug: T426216 --------- Co-authored-by: dena <91744937+deer-wmde@users.noreply.github.com>
1 parent d3e8bbe commit 02b92c3

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FROM php:8.2-apache
1616

1717
RUN apt-get update \
1818
# Needed for the imagick php extension install
19-
&& apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev mariadb-client\
19+
&& apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev mariadb-client \
2020
&& echo "" | pecl install imagick redis \
2121
&& docker-php-ext-enable imagick \
2222
&& 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
4040

4141
COPY --chown=www-data:www-data --from=composer /tmp/src2 /var/www/html
4242

43+
# Copy custom mysql config file to the container to set the `skip-ssl` option.
44+
COPY ./docker.mysql.cnf /etc/mysql/conf.d/docker.mysql.cnf
45+
4346
WORKDIR /var/www/html
4447

4548
COPY ./start.sh /usr/local/bin/start

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ services:
88
- ./start.sh:/usr/local/bin/start
99
- api-storage:/var/www/html/storage/
1010
- ./words:/words
11-
- ./docker.my.cnf:/etc/mysql/conf.d/custom.mysql.cnf
1211
ports:
1312
- 8082:80
1413
restart: always
File renamed without changes.

0 commit comments

Comments
 (0)