Skip to content

Commit 530833e

Browse files
yosifkityosifkit
committed
Move installation to /opt/drupal; symlink from /var/www/html
1 parent 4a5ce8d commit 530833e

File tree

11 files changed

+77
-99
lines changed

11 files changed

+77
-99
lines changed

‎8.8/apache-buster/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,19 @@ RUN { \
5656
echo 'opcache.fast_shutdown=1'; \
5757
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
5858

59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
5962
# https://www.drupal.org/node/3060/release
6063
ENV DRUPAL_VERSION 8.8.8
6164

62-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
63-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
65+
WORKDIR /opt/drupal
6466
RUN set -eux; \
6567
export COMPOSER_HOME="$(mktemp -d)"; \
66-
cd /var/www/; \
67-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
6870
rmdir /var/www/html; \
69-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
70-
sed -i 's!web/!html/!g' composer.json; \
71-
composer install --no-interaction; \
72-
cd html; \
73-
chown -R www-data:www-data sites modules themes; \
71+
ln -sf /opt/drupal/web /var/www/html; \
7472
# delete composer cache
7573
rm -rf "$COMPOSER_HOME"
7674

‎8.8/fpm-alpine3.12/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,19 @@ RUN { \
4646
echo 'opcache.fast_shutdown=1'; \
4747
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
4848

49+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
50+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
51+
4952
# https://www.drupal.org/node/3060/release
5053
ENV DRUPAL_VERSION 8.8.8
5154

52-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
53-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
55+
WORKDIR /opt/drupal
5456
RUN set -eux; \
5557
export COMPOSER_HOME="$(mktemp -d)"; \
56-
cd /var/www/; \
57-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
58+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
59+
chown -R www-data:www-data web/sites web/modules web/themes; \
5860
rmdir /var/www/html; \
59-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
60-
sed -i 's!web/!html/!g' composer.json; \
61-
composer install --no-interaction; \
62-
cd html; \
63-
chown -R www-data:www-data sites modules themes; \
61+
ln -sf /opt/drupal/web /var/www/html; \
6462
# delete composer cache
6563
rm -rf "$COMPOSER_HOME"
6664

‎8.8/fpm-buster/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,19 @@ RUN { \
5656
echo 'opcache.fast_shutdown=1'; \
5757
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
5858

59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
5962
# https://www.drupal.org/node/3060/release
6063
ENV DRUPAL_VERSION 8.8.8
6164

62-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
63-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
65+
WORKDIR /opt/drupal
6466
RUN set -eux; \
6567
export COMPOSER_HOME="$(mktemp -d)"; \
66-
cd /var/www/; \
67-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
6870
rmdir /var/www/html; \
69-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
70-
sed -i 's!web/!html/!g' composer.json; \
71-
composer install --no-interaction; \
72-
cd html; \
73-
chown -R www-data:www-data sites modules themes; \
71+
ln -sf /opt/drupal/web /var/www/html; \
7472
# delete composer cache
7573
rm -rf "$COMPOSER_HOME"
7674

‎8.9/apache-buster/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,19 @@ RUN { \
5656
echo 'opcache.fast_shutdown=1'; \
5757
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
5858

59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
5962
# https://www.drupal.org/node/3060/release
6063
ENV DRUPAL_VERSION 8.9.2
6164

62-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
63-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
65+
WORKDIR /opt/drupal
6466
RUN set -eux; \
6567
export COMPOSER_HOME="$(mktemp -d)"; \
66-
cd /var/www/; \
67-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
6870
rmdir /var/www/html; \
69-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
70-
sed -i 's!web/!html/!g' composer.json; \
71-
composer install --no-interaction; \
72-
cd html; \
73-
chown -R www-data:www-data sites modules themes; \
71+
ln -sf /opt/drupal/web /var/www/html; \
7472
# delete composer cache
7573
rm -rf "$COMPOSER_HOME"
7674

‎8.9/fpm-alpine3.12/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,19 @@ RUN { \
4646
echo 'opcache.fast_shutdown=1'; \
4747
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
4848

49+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
50+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
51+
4952
# https://www.drupal.org/node/3060/release
5053
ENV DRUPAL_VERSION 8.9.2
5154

52-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
53-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
55+
WORKDIR /opt/drupal
5456
RUN set -eux; \
5557
export COMPOSER_HOME="$(mktemp -d)"; \
56-
cd /var/www/; \
57-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
58+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
59+
chown -R www-data:www-data web/sites web/modules web/themes; \
5860
rmdir /var/www/html; \
59-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
60-
sed -i 's!web/!html/!g' composer.json; \
61-
composer install --no-interaction; \
62-
cd html; \
63-
chown -R www-data:www-data sites modules themes; \
61+
ln -sf /opt/drupal/web /var/www/html; \
6462
# delete composer cache
6563
rm -rf "$COMPOSER_HOME"
6664

‎8.9/fpm-buster/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,19 @@ RUN { \
5656
echo 'opcache.fast_shutdown=1'; \
5757
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
5858

59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
5962
# https://www.drupal.org/node/3060/release
6063
ENV DRUPAL_VERSION 8.9.2
6164

62-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
63-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
65+
WORKDIR /opt/drupal
6466
RUN set -eux; \
6567
export COMPOSER_HOME="$(mktemp -d)"; \
66-
cd /var/www/; \
67-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
6870
rmdir /var/www/html; \
69-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
70-
sed -i 's!web/!html/!g' composer.json; \
71-
composer install --no-interaction; \
72-
cd html; \
73-
chown -R www-data:www-data sites modules themes; \
71+
ln -sf /opt/drupal/web /var/www/html; \
7472
# delete composer cache
7573
rm -rf "$COMPOSER_HOME"
7674

‎9.0/apache-buster/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,19 @@ RUN { \
5656
echo 'opcache.fast_shutdown=1'; \
5757
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
5858

59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
5962
# https://www.drupal.org/node/3060/release
6063
ENV DRUPAL_VERSION 9.0.2
6164

62-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
63-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
65+
WORKDIR /opt/drupal
6466
RUN set -eux; \
6567
export COMPOSER_HOME="$(mktemp -d)"; \
66-
cd /var/www/; \
67-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
6870
rmdir /var/www/html; \
69-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
70-
sed -i 's!web/!html/!g' composer.json; \
71-
composer install --no-interaction; \
72-
cd html; \
73-
chown -R www-data:www-data sites modules themes; \
71+
ln -sf /opt/drupal/web /var/www/html; \
7472
# delete composer cache
7573
rm -rf "$COMPOSER_HOME"
7674

‎9.0/fpm-alpine3.12/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,19 @@ RUN { \
4646
echo 'opcache.fast_shutdown=1'; \
4747
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
4848

49+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
50+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
51+
4952
# https://www.drupal.org/node/3060/release
5053
ENV DRUPAL_VERSION 9.0.2
5154

52-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
53-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
55+
WORKDIR /opt/drupal
5456
RUN set -eux; \
5557
export COMPOSER_HOME="$(mktemp -d)"; \
56-
cd /var/www/; \
57-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
58+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
59+
chown -R www-data:www-data web/sites web/modules web/themes; \
5860
rmdir /var/www/html; \
59-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
60-
sed -i 's!web/!html/!g' composer.json; \
61-
composer install --no-interaction; \
62-
cd html; \
63-
chown -R www-data:www-data sites modules themes; \
61+
ln -sf /opt/drupal/web /var/www/html; \
6462
# delete composer cache
6563
rm -rf "$COMPOSER_HOME"
6664

‎9.0/fpm-buster/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,19 @@ RUN { \
5656
echo 'opcache.fast_shutdown=1'; \
5757
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
5858

59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
5962
# https://www.drupal.org/node/3060/release
6063
ENV DRUPAL_VERSION 9.0.2
6164

62-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
63-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
65+
WORKDIR /opt/drupal
6466
RUN set -eux; \
6567
export COMPOSER_HOME="$(mktemp -d)"; \
66-
cd /var/www/; \
67-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
6870
rmdir /var/www/html; \
69-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
70-
sed -i 's!web/!html/!g' composer.json; \
71-
composer install --no-interaction; \
72-
cd html; \
73-
chown -R www-data:www-data sites modules themes; \
71+
ln -sf /opt/drupal/web /var/www/html; \
7472
# delete composer cache
7573
rm -rf "$COMPOSER_HOME"
7674

‎Dockerfile-alpine.template‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,19 @@ RUN { \
4646
echo 'opcache.fast_shutdown=1'; \
4747
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
4848

49+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
50+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
51+
4952
# https://www.drupal.org/node/3060/release
5053
ENV DRUPAL_VERSION %%VERSION%%
5154

52-
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
53-
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
55+
WORKDIR /opt/drupal
5456
RUN set -eux; \
5557
export COMPOSER_HOME="$(mktemp -d)"; \
56-
cd /var/www/; \
57-
# composer won't install to a non-empty dir: 'Project directory "/var/www/" is not empty.'
58+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
59+
chown -R www-data:www-data web/sites web/modules web/themes; \
5860
rmdir /var/www/html; \
59-
composer create-project --no-install "drupal/recommended-project:$DRUPAL_VERSION" ./; \
60-
sed -i 's!web/!html/!g' composer.json; \
61-
composer install --no-interaction; \
62-
cd html; \
63-
chown -R www-data:www-data sites modules themes; \
61+
ln -sf /opt/drupal/web /var/www/html; \
6462
# delete composer cache
6563
rm -rf "$COMPOSER_HOME"
6664

0 commit comments

Comments
 (0)