From 0c3fdd42550394fc7275f0a22d80b8454ea5ae7b Mon Sep 17 00:00:00 2001 From: tuutti Date: Wed, 20 Mar 2024 09:46:32 +0200 Subject: [PATCH] Build SIMPLETEST_DB_URL into container, drupal-repository updates --- local/drupal/Dockerfile | 2 ++ openshift/drupal-repository/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/local/drupal/Dockerfile b/local/drupal/Dockerfile index c478bfe..8156932 100644 --- a/local/drupal/Dockerfile +++ b/local/drupal/Dockerfile @@ -22,6 +22,8 @@ RUN grep -qxF 'xdebug.log' /etc/php${PHP_SHORT_VERSION}/conf.d/xdebug.ini || ech # files. RUN sudo addgroup druid nginx +ENV SIMPLETEST_DB="mysql://${DRUPAL_DB_USER}:${DRUPAL_DB_PASS}@${DRUPAL_DB_HOST}:${DRUPAL_DB_PORT}/${DRUPAL_DB_NAME}" + FROM base as php81 RUN sudo apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing \ --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \ diff --git a/openshift/drupal-repository/Dockerfile b/openshift/drupal-repository/Dockerfile index 7bee368..4966dc6 100644 --- a/openshift/drupal-repository/Dockerfile +++ b/openshift/drupal-repository/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:3.17 +FROM alpine:3.19 COPY --from=almir/webhook /usr/local/bin/webhook /usr/local/bin/webhook # We need php and git to build satis. -RUN apk add --no-cache git php81 php81-openssl php81-common php81-json php81-phar php81-mbstring php81-pecl-apcu make +RUN apk add --no-cache git php82 php82-openssl php82-common php82-json php82-phar php82-mbstring php82-pecl-apcu php82-zip php82-simplexml make ENV COMPOSER_HOME=/.composer ENV PROJECT_DIR=/var/www/html