Merge pull request #1575 from tripal/tv4g9-1572-expandDockerBuild

Expand automated docker build set to include images without Chado
tripal · Jul 7, 2023 · d20efa0 · d20efa0
2 parents 527fef5 + 1008597
commit d20efa0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/MAIN-buildDocker.yml b/.github/workflows/MAIN-buildDocker.yml
@@ -3,8 +3,7 @@ on:
   push:
     branches:
       - 4.x
-      - 4v40g-0-test-docker-build
-      - tv4g0-issue1420-fixDockerBuild
+      - tv4g9-1572-expandDockerBuild
 
 jobs:
   push_to_registry:
@@ -26,16 +25,12 @@ jobs:
           - "10.1.x-dev"
         exclude:
           - php-version: "8.2"
-            pgsql-version: "13"
             drupal-version: "9.4.x-dev"
           - php-version: "8.2"
-            pgsql-version: "13"
             drupal-version: "9.5.x-dev"
           - php-version: "8.0"
-            pgsql-version: "13"
             drupal-version: "10.0.x-dev"
           - php-version: "8.0"
-            pgsql-version: "13"
             drupal-version: "10.1.x-dev"
     name: Docker Build (drupal${{ matrix.drupal-version }})
     steps:
@@ -52,9 +47,20 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           buildArgs: "drupalversion=${{ matrix.drupal-version }}"
           labels: 'tripal.branch=4.x,drupal.version.label="${{ matrix.label }}",php.version.label="${{ matrix.php-version }}", postgresql.version.label="${{ matrix.pgsql-version }}"'
+      - uses: mr-smithers-excellent/docker-build-push@v5
+        name: Build & push Full matrix of Docker images WITH NO CHADO
+        with:
+          image: tripalproject/tripaldocker
+          tags: drupal${{ matrix.drupal-version }}-php${{ matrix.php-version }}-pgsql${{ matrix.pgsql-version }}-noChado
+          dockerfile: tripaldocker/Dockerfile-php${{ matrix.php-version }}-pgsql${{ matrix.pgsql-version }}
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          buildArgs: "drupalversion=${{ matrix.drupal-version }},installchado=FALSE"
+          labels: 'tripal.branch=4.x,drupal.version.label="${{ matrix.label }}",php.version.label="${{ matrix.php-version }}", postgresql.version.label="${{ matrix.pgsql-version }}"'
       - uses: mr-smithers-excellent/docker-build-push@v5
         name: Build & push Docker image Drupal focused Docker images.
-        if: ${{ matrix.php-version == '8.1' && matrix.pgsql-version == '13'}}
+        if: ${{ matrix.php-version == '8.1' && matrix.pgsql-version == '13' }}
         with:
           image: tripalproject/tripaldocker
           tags: drupal${{ matrix.drupal-version }}
@@ -65,8 +71,8 @@ jobs:
           buildArgs: "drupalversion=${{ matrix.drupal-version }}"
           labels: 'tripal.branch=4.x,drupal.version.label="${{ matrix.label }}",php.version.label="${{ matrix.php-version }}", postgresql.version.label="${{ matrix.pgsql-version }}"'
       - uses: mr-smithers-excellent/docker-build-push@v5
-        name: Build latest using 9.5.x-dev, PHP 8.1, PgSQL 13
-        if: ${{ matrix.drupal-version == '9.5.x-dev' && matrix.php-version == '8.1' && matrix.pgsql-version == '13'}}
+        name: Build latest using 10.0.x-dev, PHP 8.1, PgSQL 13
+        if: ${{ matrix.drupal-version == '10.0.x-dev' && matrix.php-version == '8.1' && matrix.pgsql-version == '13' }}
         with:
           image: tripalproject/tripaldocker
           tags: latest

diff --git a/tripaldocker/Dockerfile-php8.0-pgsql13 b/tripaldocker/Dockerfile-php8.0-pgsql13
@@ -1,10 +1,5 @@
 FROM php:8.0-apache-bullseye
 
-## Base of this image is from Official DockerHub PHP image.
-## Heavily influenced by https://github.com/statonlab/docker-containers
-
-MAINTAINER Lacey-Anne Sanderson <laceyannesanderson@gmail.com>
-
 ARG drupalversion='9.3.x-dev'
 ARG modules='devel devel_php'
 ARG chadoschema='chado'

diff --git a/tripaldocker/Dockerfile-php8.1-pgsql13 b/tripaldocker/Dockerfile-php8.1-pgsql13
@@ -1,11 +1,6 @@
 FROM php:8.1-apache-bullseye
 
-## Base of this image is from Official DockerHub PHP image.
-## Heavily influenced by https://github.com/statonlab/docker-containers
-
-MAINTAINER Lacey-Anne Sanderson <laceyannesanderson@gmail.com>
-
-ARG drupalversion='9.4.x-dev'
+ARG drupalversion='10.0.x-dev'
 ARG modules='devel devel_php'
 ARG chadoschema='chado'
 ARG installchado=TRUE