From 5d3ae23b547870ebf21ba5b7d33b5661b8d49148 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 20 Dec 2022 19:19:45 -0800 Subject: [PATCH] Switch to apache image --- Dockerfile | 10 +++++++--- docker-compose.yml | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 32d8d10..c55220a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ -FROM drupal:9.5.0-php8.1-fpm-alpine3.16 +FROM drupal:9.5.0-php8.1-apache-bullseye -RUN apk add --no-cache git +# RUN apk add --no-cache git +RUN apt update; \ + apt install -y --no-install-recommends git wget; \ + rm -rf /var/lib/apt/lists/* RUN set -eux; \ rm -rf /opt/drupal/ @@ -14,7 +17,8 @@ RUN set -eux; \ sed -i 's,git@\([^:]*\):,https://\1/,g' composer.json; \ sed -i 's,git@\([^:]*\):,https://\1/,g' composer.lock; \ composer install; \ - rm -rf "$COMPOSER_HOME" + rm -rf "$COMPOSER_HOME"; \ + chown -R www-data:www-data web/sites web/modules web/themes WORKDIR /opt/drupal/web diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e8431c9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3.8' + +services: + app: + image: git.coopcloud.tech/coop-cloud-chaos-patchs/drutopia:dev-master + build: . + ports: + - "80:80"