From 2fcf7c812432dc3f7100ef561bd57e9d56696e50 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 8 Dec 2023 12:20:25 +1100 Subject: [PATCH] update build lists --- .github/workflows/build-push-buildx.yaml | 4 +- .github/workflows/build-push.yaml | 202 +++++++++++------------ 2 files changed, 101 insertions(+), 105 deletions(-) diff --git a/.github/workflows/build-push-buildx.yaml b/.github/workflows/build-push-buildx.yaml index d763addec..954bb2472 100644 --- a/.github/workflows/build-push-buildx.yaml +++ b/.github/workflows/build-push-buildx.yaml @@ -3,10 +3,10 @@ name: Lagoon Image Build - buildx on: push: branches: - - 'testing/docker_buildx**' + - 'testing-docker_buildx**' pull_request: branches: - - 'testing/docker_buildx**' + - 'testing-docker_buildx**' jobs: changes: diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index 62bf6c52b..a7488f49b 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -3,7 +3,7 @@ name: Lagoon Image Build on: push: branches: - - 'testing/docker_buildx' + - 'testing-docker_buildx' jobs: build: @@ -46,39 +46,19 @@ jobs: - image_name: mariadb-10.6-drupal context: images/mariadb-drupal dockerfile: 10.6.Dockerfile - requires: mariadb-10.6 - - image_name: elasticsearch-7 - context: images/elasticsearch - dockerfile: 7.Dockerfile - requires: commons - - image_name: logstash-7 - context: images/logstash - dockerfile: 7.Dockerfile - requires: commons - - image_name: kibana-7 - context: images/kibana - dockerfile: 7.Dockerfile + requires: mariadb-10.11 + - image_name: mariadb-10.11 + context: images/mariadb + dockerfile: 10.11.Dockerfile requires: commons + - image_name: mariadb-10.11-drupal + context: images/mariadb-drupal + dockerfile: 10.11.Dockerfile + requires: mariadb-10.11 - image_name: mongo-4 context: images/mongo dockerfile: 4.Dockerfile requires: commons - - image_name: node-14 - context: images/node - dockerfile: 14.Dockerfile - requires: commons - - image_name: node-14-builder - context: images/node-builder - dockerfile: 14.Dockerfile - requires: node-14 - - image_name: node-16 - context: images/node - dockerfile: 16.Dockerfile - requires: commons - - image_name: node-16-builder - context: images/node-builder - dockerfile: 16.Dockerfile - requires: node-16 - image_name: node-18 context: images/node dockerfile: 18.Dockerfile @@ -87,25 +67,25 @@ jobs: context: images/node-builder dockerfile: 18.Dockerfile requires: node-18 - - image_name: python-3.7 - context: images/python - dockerfile: 3.7.Dockerfile - requires: commons - - image_name: python-3.8 - context: images/python - dockerfile: 3.8.Dockerfile - requires: commons - - image_name: python-3.9 - context: images/python - dockerfile: 3.9.Dockerfile - requires: commons - - image_name: python-3.10 - context: images/python - dockerfile: 3.10.Dockerfile + - image_name: node-18-cli + context: images/node-cli + dockerfile: 18.Dockerfile + requires: node-18 + - image_name: node-20 + context: images/node + dockerfile: 20.Dockerfile requires: commons - - image_name: python-3.11 - context: images/python - dockerfile: 3.11.Dockerfile + - image_name: node-20-builder + context: images/node-builder + dockerfile: 20.Dockerfile + requires: node-20 + - image_name: node-20-cli + context: images/node-cli + dockerfile: 20.Dockerfile + requires: node-20 + - image_name: opensearch-2 + context: images/opensearch + dockerfile: 2.Dockerfile requires: commons - image_name: php-8.0-fpm context: images/php-fpm @@ -187,6 +167,34 @@ jobs: context: images/postgres-drupal dockerfile: 15.Dockerfile requires: postgres-15 + - image_name: postgres-16 + context: images/postgres + dockerfile: 16.Dockerfile + requires: commons + - image_name: postgres-16-drupal + context: images/postgres-drupal + dockerfile: 16.Dockerfile + requires: postgres-16 + - image_name: python-3.8 + context: images/python + dockerfile: 3.8.Dockerfile + requires: commons + - image_name: python-3.9 + context: images/python + dockerfile: 3.9.Dockerfile + requires: commons + - image_name: python-3.10 + context: images/python + dockerfile: 3.10.Dockerfile + requires: commons + - image_name: python-3.11 + context: images/python + dockerfile: 3.11.Dockerfile + requires: commons + - image_name: python-3.12 + context: images/python + dockerfile: 3.12.Dockerfile + requires: commons - image_name: rabbitmq context: images/rabbitmq dockerfile: Dockerfile @@ -195,6 +203,50 @@ jobs: context: images/rabbitmq-cluster dockerfile: Dockerfile requires: rabbitmq + - image_name: redis-6 + context: images/redis + dockerfile: 6.Dockerfile + requires: commons + - image_name: redis-6-persistent + context: images/redis-persistent + dockerfile: 6.Dockerfile + requires: redis-6 + - image_name: redis-7 + context: images/redis + dockerfile: 7.Dockerfile + requires: commons + - image_name: redis-7-persistent + context: images/redis-persistent + dockerfile: 7.Dockerfile + requires: redis-7 + - image_name: ruby-3.0 + context: images/ruby + dockerfile: 3.0.Dockerfile + requires: commons + - image_name: ruby-3.1 + context: images/ruby + dockerfile: 3.1.Dockerfile + requires: commons + - image_name: ruby-3.2 + context: images/ruby + dockerfile: 3.2.Dockerfile + requires: commons + - image_name: solr-7 + context: images/solr + dockerfile: 7.Dockerfile + requires: commons + - image_name: solr-7-drupal + context: images/solr-drupal + dockerfile: 7.Dockerfile + requires: solr-7 + - image_name: solr-8 + context: images/solr + dockerfile: 8.Dockerfile + requires: commons + - image_name: solr-8-drupal + context: images/solr-drupal + dockerfile: 8.Dockerfile + requires: solr-8 - image_name: varnish-6 context: images/varnish dockerfile: 6.Dockerfile @@ -227,62 +279,6 @@ jobs: context: images/varnish-persistent-drupal dockerfile: 7.Dockerfile requires: varnish-7-drupal - - image_name: solr-7 - context: images/solr - dockerfile: 7.Dockerfile - requires: commons - - image_name: solr-7-drupal - context: images/solr-drupal - dockerfile: 7.Dockerfile - requires: solr-7 - - image_name: solr-8 - context: images/solr - dockerfile: 8.Dockerfile - requires: commons - - image_name: solr-8-drupal - context: images/solr-drupal - dockerfile: 8.Dockerfile - requires: solr-8 - - image_name: redis-5 - context: images/redis - dockerfile: 5.Dockerfile - requires: commons - - image_name: redis-5-persistent - context: images/redis-persistent - dockerfile: 5.Dockerfile - requires: redis-5 - - image_name: redis-6 - context: images/redis - dockerfile: 6.Dockerfile - requires: commons - - image_name: redis-6-persistent - context: images/redis-persistent - dockerfile: 6.Dockerfile - requires: redis-6 - - image_name: redis-7 - context: images/redis - dockerfile: 7.Dockerfile - requires: commons - - image_name: redis-7-persistent - context: images/redis-persistent - dockerfile: 7.Dockerfile - requires: redis-7 - - image_name: ruby-3.0 - context: images/ruby - dockerfile: 3.0.Dockerfile - requires: commons - - image_name: ruby-3.1 - context: images/ruby - dockerfile: 3.1.Dockerfile - requires: commons - - image_name: ruby-3.2 - context: images/ruby - dockerfile: 3.2.Dockerfile - requires: commons - - image_name: opensearch-2 - context: images/opensearch - dockerfile: 2.Dockerfile - requires: commons steps: -