feat: New 10.x distributions from #12, update Dockerfiles

theodorosploumis · Nov 16, 2024 · 0392d9e · 0392d9e
1 parent d8203b1
commit 0392d9e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/images/10x/drutopia/Dockerfile b/images/10x/drutopia/Dockerfile
@@ -3,14 +3,12 @@ FROM drupal8/distros
 MAINTAINER Theodoros Ploumis - www.theodorosploumis.com
 
 ENV DISTRO="drutopia" \
-    VERSION="1.18" \
+    VERSION="2.0.0" \
     PROFILE="drutopia"
 
 # This is an installation from a composer template
-RUN rm -rf /opt/drupal/
-
-RUN COMPOSER=composer.json composer create-project drutopia/drutopia_template:dev-master /opt/drupal/ \
-    --no-install --quiet --no-ansi --no-interaction --no-progress
+RUN COMPOSER=composer.json composer require drutopia/drutopia \
+    --quiet --no-ansi --no-interaction --no-progress
 
 RUN COMPOSER=composer.json composer require drush/drush  \
     --quiet --no-ansi --no-interaction --no-progress

diff --git a/images/10x/open-social/Dockerfile b/images/10x/open-social/Dockerfile
@@ -7,12 +7,12 @@ ENV DISTRO="social" \
     PROFILE="social"
 
 # This is an installation from a composer template
-RUN COMPOSER=composer.json composer remove drupal/core-composer-scaffold
-RUN COMPOSER=composer.json composer remove drupal/core-recommended
-RUN COMPOSER=composer.json composer remove drush/drush
+RUN COMPOSER=composer.json composer remove drupal/core-composer-scaffold --quiet --no-ansi --no-interaction --no-progress
+RUN COMPOSER=composer.json composer remove drupal/core-recommended --quiet --no-ansi --no-interaction --no-progress
+RUN COMPOSER=composer.json composer remove drush/drush --quiet --no-ansi --no-interaction --no-progress
 
-RUN COMPOSER=composer.json composer require goalgorilla/open_social:${VERSION}
-    --quiet --no-ansi --no-interaction --no-progress \
+RUN COMPOSER=composer.json composer require goalgorilla/open_social:${VERSION} \
+    --quiet --no-ansi --no-interaction --no-progress
 
 RUN COMPOSER=composer.json composer require drush/drush  \
     --quiet --no-ansi --no-interaction --no-progress

diff --git a/images/10x/openlucius/Dockerfile b/images/10x/openlucius/Dockerfile
@@ -10,7 +10,8 @@ ENV DISTRO="openlucius" \
 RUN rm -rf /opt/drupal/
 
 RUN COMPOSER=composer.json composer create-project lucius-digital/openlucius-project:2.0.0-beta1 /opt/drupal/ \
-    --no-install --quiet --no-ansi --no-interaction --no-progress
+    --dev --quiet --no-ansi --no-interaction --no-progress
+
 
 # Install Drupal
 RUN bash /opt/install.sh

diff --git a/images/10x/tags.txt b/images/10x/tags.txt
@@ -1,6 +1,7 @@
 latest
 drupal
 drupal-umami
-opigno
 open-social
-drutopia
+opigno
+drutopia
+openlucius
diff --git a/images/README.md b/images/README.md
@@ -1,26 +1,24 @@
 ## Build the base image
 
 ```
-docker build -t drupal8/distros:latest-10x images/10x/latest
+docker build -t drupal8/distros:latest images/10x/latest
 ```
 
 ## Build a distro (eg lightning)
 
 ```
-docker build -t drupal8/distros:lightning-10x images/10x/lightning
+docker build -t drupal8/distros:drupal-umami-10x images/10x/drupal-umami
 ```
 
 ## Test the build
 ```
-docker run -p 8066:80 --name latest-10x drupal8/distros:latest-10x
+docker run -p 8066:80 --name drupal-umami-10x drupal8/distros:drupal-umami-10x
 ```
 
-## Tag the new image and push
+## Push the new images
 
 ```
-docker tag drupal8/distros:latest drupal8/distros:latest-10x
-
-docker push drupal8/distros:latest
+docker push drupal8/distros:drupal-umami-10x
 ```
 
 ## How to add a new Distro