diff --git a/.github/workflows/build-push-buildx.yaml b/.github/workflows/build-push-buildx.yaml new file mode 100644 index 000000000..852e02ec2 --- /dev/null +++ b/.github/workflows/build-push-buildx.yaml @@ -0,0 +1,266 @@ +name: Lagoon Image Build - buildx + +on: + push: + branches: + - 'testing/docker_buildx**' + pull_request: + branches: + - 'testing/docker_buildx**' + +jobs: + changes: + runs-on: ubuntu-latest + outputs: + # Expose matched filters as job 'package_group' output variable + package_group: ${{ steps.filter.outputs.changes }} + steps: + - + name: Checkout + uses: actions/checkout@v4 + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + mariadb: + - 'images/mariadb/**' + - '!images/**' + node: + - 'images/node/**' + - '!images/**' + php: + - 'images/php/**' + - '!images/**' + postgres: + - 'images/postgres/**' + - '!images/**' + python: + - 'images/python/**' + - '!images/**' + redis: + - 'images/redis/**' + - '!images/**' + ruby: + - 'images/ruby/**' + - '!images/**' + solr: + - 'images/solr/**' + - '!images/**' + varnish: + - 'images/varnish/**' + - '!images/**' + others: + - 'images/commons/**' + - 'images/elasticsearch-7/**' + - 'images/kibana-7/**' + - 'images/logstash-7/**' + - 'images/mongo-4/**' + - 'images/nginx/**' + - 'images/nginx-drupal/**' + - 'images/opensearch-2/**' + - 'images/rabbitmq/**' + - 'images/rabbitmq-cluster/**' + - '!images/**' + + build: + needs: changes + strategy: + fail-fast: false + matrix: + package_group: ${{ fromJSON(needs.changes.outputs.package_group) }} + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + # - + # name: Restore docker cache + # id: cache-packages-restore + # uses: actions/cache/restore@v3 + # with: + # path: | + # /tmp/.buildx-cache + # key: ${{ runner.os }}-buildx-${{ matrix.package_group }} + - + name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ matrix.package_group }}-${{ hashFiles('**/images') }} + restore-keys: | + ${{ runner.os }}-buildx- + # - + # name: Login to DockerHub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build + uses: docker/bake-action@v4 + with: + files: | + ./docker-bake.hcl + targets: ${{ matrix.package_group }} + push: true + # set: | + # *.cache-from=type=gha + # *.cache-to=type=gha,mode=max + set: | + *.cache-from=type=local,src=/tmp/.buildx-cache + *.cache-to=type=local,dest=/tmp/.buildx-cache-new + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache + # - + # name: Save docker cache + # uses: actions/cache/save@v3 + # with: + # path: | + # /tmp/.buildx-cache + # key: ${{ runner.os }}-buildx-${{ matrix.package_group }}-${{ hashFiles('**/images') }} + # - + # name: Build and push + # uses: docker/build-push-action@v5 + # with: + # context: ${{ matrix.context }} + # file: ${{ matrix.context }}/${{ matrix.dockerfile }} + # platforms: linux/amd64,linux/arm64 + # push: true + # tags: ${{ steps.meta.outputs.tags }} + # labels: ${{ steps.meta.outputs.labels }} + # cache-from: | + # type=registry,ref=docker.io/testlagoon/${{ matrix.image_name }}:main + # type=registry,ref=ghcr.io/tobybellwood/${{ matrix.image_name }}:${{ github.ref_name }} + # type=gha + # cache-to: | + # type=gha,mode=max + # build-args: | + # IMAGE_REPO=ghcr.io/${{ github.repository_owner }} + # IMAGE_TAG=${{ github.ref_name }} + # BUILDKIT_INLINE_CACHE=1 + # - + # uses: anchore/sbom-action@v0 + # with: + # image: ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.ref_name }} + # artifact-name: ${{ matrix.image_name }}.cyclonedx + # format: cyclonedx + # - + # name: view SBOM + # run: | + # cat /tmp/sbom-action-*/${{ matrix.image_name }}.cyclonedx + + # app_test: + # runs-on: ubuntu-latest + # needs: build + # defaults: + # run: + # working-directory: ./tests + # steps: + # - + # name: Checkout + # uses: actions/checkout@v4 + # - + # name: Checkout + # uses: actions/checkout@v4 + # with: + # repository: uselagoon/lagoon-examples + # path: tests + # - + # name: Add additional tests + # run: | + # git submodule add -b php74 https://github.com/lagoon-examples/drupal9-postgres drupal9-postgres-php74 + # git submodule add -b php81 https://github.com/lagoon-examples/drupal9-base drupal9-base-php81 + # - + # name: Update git submodules + # run: | + # git submodule sync + # git submodule update --init + # - + # name: Use built images to test + # run: | + # grep -rl uselagoon . | xargs sed -i '/^FROM/ s#latest#${{ github.ref_name }}#' + # grep -rl uselagoon . | xargs sed -i '/^FROM/ s#uselagoon#ghcr.io/${{ github.repository_owner }}#' + # grep -rl uselagoon . | xargs sed -i '/image:/ s#latest#${{ github.ref_name }}#' + # grep -rl uselagoon . | xargs sed -i '/image:/ s#uselagoon#ghcr.io/${{ github.repository_owner }}#' + # find . -maxdepth 2 -name docker-compose.yml | xargs sed -i -e '/###/d' + # - + # name: check replacements + # run: | + # find . -maxdepth 2 -name docker-compose.yml | xargs grep image: + # find . -maxdepth 3 -name *.dockerfile | xargs grep ^FROM + # - + # name: Install test harness + # run: | + # yarn install + # - + # name: Generate test files + # run: | + # yarn generate-tests + # - + # name: Run docker-compose tests + # run: | + # yarn test:dockercompose + + # image_test: + # runs-on: ubuntu-latest + # needs: build + # defaults: + # run: + # working-directory: ./tests + # steps: + # - + # name: Checkout + # uses: actions/checkout@v4 + # - + # name: Checkout + # uses: actions/checkout@v4 + # with: + # repository: uselagoon/lagoon-examples + # path: tests + # - + # name: Add additional tests + # run: | + # mkdir -p ./all-images && cp ../helpers/docker-compose.yml ./all-images/ && cp ../helpers/TESTING_dockercompose.md ./all-images/ + # - + # name: Use built images to test + # run: | + # grep -rl uselagoon . | xargs sed -i '/image:/ s#latest#${{ github.ref_name }}#' + # grep -rl uselagoon . | xargs sed -i '/image:/ s#uselagoon#ghcr.io/${{ github.repository_owner }}#' + # find . -maxdepth 2 -name docker-compose.yml | xargs sed -i -e '/###/d' + # - + # name: check replacements + # run: | + # find . -maxdepth 2 -name docker-compose.yml | xargs cat + # - + # name: check dc builds + # run: | + # cd ./all-images + # docker-compose up -d + # docker-compose logs + # - + # name: Install test harness + # run: | + # yarn install + # - + # name: Generate test files + # run: | + # yarn generate-tests + # - + # name: Run docker-compose tests + # run: | + # yarn test:dockercompose diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml new file mode 100644 index 000000000..4247b7f3b --- /dev/null +++ b/.github/workflows/build-push.yaml @@ -0,0 +1,470 @@ +name: Lagoon Image Build + +on: + push: + branches: + - 'testing/docker_buildx' + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - image_name: commons + context: images/commons + dockerfile: Dockerfile + - image_name: nginx + context: images/nginx + dockerfile: Dockerfile + requires: commons + - image_name: nginx-drupal + context: images/nginx-drupal + dockerfile: Dockerfile + requires: nginx + - image_name: mariadb-10.4 + context: images/mariadb + dockerfile: 10.4.Dockerfile + requires: commons + - image_name: mariadb-10.4-drupal + context: images/mariadb-drupal + dockerfile: 10.4.Dockerfile + requires: mariadb-10.4 + - image_name: mariadb-10.5 + context: images/mariadb + dockerfile: 10.5.Dockerfile + requires: commons + - image_name: mariadb-10.5-drupal + context: images/mariadb-drupal + dockerfile: 10.5.Dockerfile + requires: mariadb-10.5 + - image_name: mariadb-10.6 + context: images/mariadb + dockerfile: 10.6.Dockerfile + requires: commons + - 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: commons + - 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 + requires: commons + - image_name: node-18-builder + 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 + requires: commons + - image_name: python-3.11 + context: images/python + dockerfile: 3.11.Dockerfile + requires: commons + - image_name: php-8.0-fpm + context: images/php-fpm + dockerfile: 8.0.Dockerfile + requires: commons + - image_name: php-8.0-cli + context: images/php-cli + dockerfile: 8.0.Dockerfile + requires: php-8.0-fpm + - image_name: php-8.0-cli-drupal + context: images/php-cli-drupal + dockerfile: 8.0.Dockerfile + requires: php-8.0-cli + - image_name: php-8.1-fpm + context: images/php-fpm + dockerfile: 8.1.Dockerfile + requires: commons + - image_name: php-8.1-cli + context: images/php-cli + dockerfile: 8.1.Dockerfile + requires: php-8.1-fpm + - image_name: php-8.1-cli-drupal + context: images/php-cli-drupal + dockerfile: 8.1.Dockerfile + requires: php-8.1-cli + - image_name: php-8.2-fpm + context: images/php-fpm + dockerfile: 8.2.Dockerfile + requires: commons + - image_name: php-8.2-cli + context: images/php-cli + dockerfile: 8.2.Dockerfile + requires: php-8.2-fpm + - image_name: php-8.2-cli-drupal + context: images/php-cli-drupal + dockerfile: 8.2.Dockerfile + requires: php-8.2-cli + - image_name: postgres-11 + context: images/postgres + dockerfile: 11.Dockerfile + requires: commons + - image_name: postgres-11-drupal + context: images/postgres-drupal + dockerfile: 11.Dockerfile + requires: postgres-11 + - image_name: postgres-11-ckan + context: images/postgres-ckan + dockerfile: 11.Dockerfile + requires: postgres-11 + - image_name: postgres-12 + context: images/postgres + dockerfile: 12.Dockerfile + requires: commons + - image_name: postgres-12-drupal + context: images/postgres-drupal + dockerfile: 12.Dockerfile + requires: postgres-12 + - image_name: postgres-13 + context: images/postgres + dockerfile: 13.Dockerfile + requires: commons + - image_name: postgres-13-drupal + context: images/postgres-drupal + dockerfile: 13.Dockerfile + requires: postgres-13 + - image_name: postgres-14 + context: images/postgres + dockerfile: 14.Dockerfile + requires: commons + - image_name: postgres-14-drupal + context: images/postgres-drupal + dockerfile: 14.Dockerfile + requires: postgres-14 + - image_name: postgres-15 + context: images/postgres + dockerfile: 15.Dockerfile + requires: commons + - image_name: postgres-15-drupal + context: images/postgres-drupal + dockerfile: 15.Dockerfile + requires: postgres-15 + - image_name: rabbitmq + context: images/rabbitmq + dockerfile: Dockerfile + requires: commons + - image_name: rabbitmq-cluster + context: images/rabbitmq-cluster + dockerfile: Dockerfile + requires: rabbitmq + - image_name: varnish-6 + context: images/varnish + dockerfile: 6.Dockerfile + requires: commons + - image_name: varnish-6-drupal + context: images/varnish-drupal + dockerfile: 6.Dockerfile + requires: varnish-6 + - image_name: varnish-6-persistent + context: images/varnish-persistent + dockerfile: 6.Dockerfile + requires: varnish-6 + - image_name: varnish-6-persistent-drupal + context: images/varnish-persistent-drupal + dockerfile: 6.Dockerfile + requires: varnish-6-drupal + - image_name: varnish-7 + context: images/varnish + dockerfile: 7.Dockerfile + requires: commons + - image_name: varnish-7-drupal + context: images/varnish-drupal + dockerfile: 7.Dockerfile + requires: varnish-7 + - image_name: varnish-7-persistent + context: images/varnish-persistent + dockerfile: 7.Dockerfile + requires: varnish-7 + - image_name: varnish-7-persistent-drupal + 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: + - + name: Wait for commons upstream + if: ${{ matrix.requires == 'commons' }} + run: sleep 60s + shell: bash + - + name: Wait for non-commons upstream + if: ${{ matrix.image_name != 'commons' && matrix.requires != 'commons' }} + run: sleep 180s + shell: bash + - + name: Wait for dependent builds to succeed + if: ${{ matrix.requires }} + uses: lewagon/wait-on-check-action@v1 + with: + ref: ${{ github.ref }} + check-regexp: 'build \(${{ matrix.requires }},.?' + repo-token: ${{ secrets.GITHUB_TOKEN }} + wait-interval: 60 + - + name: Checkout + uses: actions/checkout@v4 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }} + labels: | + org.opencontainers.image.authors=The Lagoon Authors + org.opencontainers.image.description=${{ matrix.image_name }} image built for Lagoon + org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/lagoon-images/tree/${{ github.ref_name }}/${{ matrix.context }}/${{ matrix.dockerfile }} + org.opencontainers.image.title=${{ github.repository_owner }}/${{ matrix.image_name }} + org.opencontainers.image.url=https://github.com/uselagoon/lagoon-images + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + # - + # name: Login to DockerHub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v5 + with: + context: ${{ matrix.context }} + file: ${{ matrix.context }}/${{ matrix.dockerfile }} + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: | + type=registry,ref=docker.io/testlagoon/${{ matrix.image_name }}:main + type=registry,ref=ghcr.io/tobybellwood/${{ matrix.image_name }}:${{ github.ref_name }} + build-args: | + IMAGE_REPO=ghcr.io/${{ github.repository_owner }} + IMAGE_TAG=${{ github.ref_name }} + BUILDKIT_INLINE_CACHE=1 + - + uses: anchore/sbom-action@v0 + with: + image: ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.ref_name }} + artifact-name: ${{ matrix.image_name }}.cyclonedx + format: cyclonedx + - + name: view SBOM + run: | + cat /tmp/sbom-action-*/${{ matrix.image_name }}.cyclonedx + + app_test: + runs-on: ubuntu-latest + needs: build + defaults: + run: + working-directory: ./tests + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Checkout + uses: actions/checkout@v4 + with: + repository: uselagoon/lagoon-examples + path: tests + - + name: Add additional tests + run: | + git submodule add -b php74 https://github.com/lagoon-examples/drupal9-postgres drupal9-postgres-php74 + git submodule add -b php81 https://github.com/lagoon-examples/drupal9-base drupal9-base-php81 + - + name: Update git submodules + run: | + git submodule sync + git submodule update --init + - + name: Use built images to test + run: | + grep -rl uselagoon . | xargs sed -i '/^FROM/ s#latest#${{ github.ref_name }}#' + grep -rl uselagoon . | xargs sed -i '/^FROM/ s#uselagoon#ghcr.io/${{ github.repository_owner }}#' + grep -rl uselagoon . | xargs sed -i '/image:/ s#latest#${{ github.ref_name }}#' + grep -rl uselagoon . | xargs sed -i '/image:/ s#uselagoon#ghcr.io/${{ github.repository_owner }}#' + find . -maxdepth 2 -name docker-compose.yml | xargs sed -i -e '/###/d' + - + name: check replacements + run: | + find . -maxdepth 2 -name docker-compose.yml | xargs grep image: + find . -maxdepth 3 -name *.dockerfile | xargs grep ^FROM + - + name: Install test harness + run: | + yarn install + - + name: Generate test files + run: | + yarn generate-tests + - + name: Run docker-compose tests + run: | + yarn test:dockercompose + + image_test: + runs-on: ubuntu-latest + needs: build + defaults: + run: + working-directory: ./tests + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Checkout + uses: actions/checkout@v4 + with: + repository: uselagoon/lagoon-examples + path: tests + - + name: Add additional tests + run: | + mkdir -p ./all-images && cp ../helpers/docker-compose.yml ./all-images/ && cp ../helpers/TESTING_dockercompose.md ./all-images/ + - + name: Use built images to test + run: | + grep -rl uselagoon . | xargs sed -i '/image:/ s#latest#${{ github.ref_name }}#' + grep -rl uselagoon . | xargs sed -i '/image:/ s#uselagoon#ghcr.io/${{ github.repository_owner }}#' + find . -maxdepth 2 -name docker-compose.yml | xargs sed -i -e '/###/d' + - + name: check replacements + run: | + find . -maxdepth 2 -name docker-compose.yml | xargs cat + - + name: check dc builds + run: | + cd ./all-images + docker-compose up -d + docker-compose logs + - + name: Install test harness + run: | + yarn install + - + name: Generate test files + run: | + yarn generate-tests + - + name: Run docker-compose tests + run: | + yarn test:dockercompose diff --git a/Makefile b/Makefile index d2994f616..bb1d12a6b 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,16 @@ docker_build_local = DOCKER_BUILDKIT=1 docker build $(DOCKER_BUILD_PARAMS) \ -t $(CI_BUILD_TAG)/$(1) \ -f $(2) $(3) +docker_buildx_local = docker buildx build $(DOCKER_BUILD_PARAMS) \ + --builder ci-local \ + --platform linux/amd64 \ + --build-arg BUILDKIT_INLINE_CACHE=1 \ + --cache-from testlagoon/$(1):main \ + --build-arg LAGOON_VERSION=$(LAGOON_VERSION) \ + --build-arg IMAGE_REPO=$(CI_BUILD_TAG) \ + -t $(CI_BUILD_TAG)/$(1) \ + -f $(2) $(3) + docker_buildx_two = docker buildx build $(DOCKER_BUILD_PARAMS) \ --builder ci-local \ --platform linux/amd64,linux/arm64/v8 \ diff --git a/docker-bake.hcl b/docker-bake.hcl new file mode 100644 index 000000000..2d0c765e0 --- /dev/null +++ b/docker-bake.hcl @@ -0,0 +1,1108 @@ +# docker-bake.dev.hcl +# docker-bake.dev.hcl +variable "CI_BUILD_TAG" { + default = "lagoon" +} + +variable "TAG" { + default = "latest" +} + +variable "LAGOON_VERSION" { + default = "development" +} + +variable "IMAGE_REPO" { + default = "lagoon" +} + +variable "IMAGE_TAG" { + default = "latest" +} + +variable "PLATFORMS" { + // use PLATFORMS=linux/amd64,linux/arm64 to override default single architecture on the cli + default = "linux/amd64" +} + +target "default"{ + platforms = ["${PLATFORMS}"] + dockerfile = "Dockerfile" + labels = { + "org.opencontainers.image.source": "https://github.com/uselagoon/lagoon-images", + "org.opencontainers.image.url": "https://github.com/uselagoon/lagoon-images", + "org.opencontainers.image.description": "Docker images optimised for running in Lagoon in production and locally", + "org.opencontainers.image.licenses": "Apache 2.0", + "org.opencontainers.image.version": "${LAGOON_VERSION}", + "repository": "https://github.com/uselagoon/lagoon-images" + } + args = { + LAGOON_VERSION = "${LAGOON_VERSION}" + IMAGE_REPO = "${IMAGE_REPO}" + IMAGE_TAG = "${IMAGE_TAG}" + } +} + +group "default" { + targets = [ + "commons", + "mariadb-10-4", + "mariadb-10-4-drupal", + "mariadb-10-5", + "mariadb-10-5-drupal", + "mariadb-10-6", + "mariadb-10-6-drupal", + "mariadb-10-11", + "mariadb-10-11-drupal", + "mongo-4", + "nginx", + "nginx-drupal", + "node-18", + "node-18-builder", + "node-18-cli", + "node-20", + "node-20-builder", + "node-20-cli", + "opensearch-2", + "php-8-0-fpm", + "php-8-0-cli", + "php-8-0-cli-drupal", + "php-8-1-fpm", + "php-8-1-cli", + "php-8-1-cli-drupal", + "php-8-2-fpm", + "php-8-2-cli", + "php-8-2-cli-drupal", + "postgres-11", + "postgres-11-drupal", + "postgres-12", + "postgres-12-drupal", + "postgres-13", + "postgres-13-drupal", + "postgres-14", + "postgres-14-drupal", + "postgres-15", + "postgres-15-drupal", + "postgres-16", + "postgres-16-drupal", + "python-3-8", + "python-3-9", + "python-3-10", + "python-3-11", + "python-3-12", + "rabbitmq", + "rabbitmq-cluster", + "redis-6", + "redis-6-persistent", + "redis-7", + "redis-7-persistent", + "ruby-3-0", + "ruby-3-1", + "ruby-3-2", + "solr-7", + "solr-7-drupal", + "solr-8", + "solr-8-drupal", + "varnish-6", + "varnish-6-drupal", + "varnish-6-persistent", + "varnish-6-persistent-drupal", + "varnish-7", + "varnish-7-drupal", + "varnish-7-persistent", + "varnish-7-persistent-drupal" + ] +} + +group "mariadb" { + targets = [ + "commons", + "mariadb-10-4", + "mariadb-10-4-drupal", + "mariadb-10-5", + "mariadb-10-5-drupal", + "mariadb-10-6", + "mariadb-10-6-drupal", + "mariadb-10-11", + "mariadb-10-11-drupal", + ] +} + +group "node" { + targets = [ + "commons", + "node-18", + "node-18-builder", + "node-18-cli", + "node-20", + "node-20-builder", + "node-20-cli", + ] +} + +group "php" { + targets = [ + "commons", + "php-8-0-fpm", + "php-8-0-cli", + "php-8-0-cli-drupal", + "php-8-1-fpm", + "php-8-1-cli", + "php-8-1-cli-drupal", + "php-8-2-fpm", + "php-8-2-cli", + "php-8-2-cli-drupal" + ] +} + +group "postgres" { + targets = [ + "commons", + "postgres-11", + "postgres-11-drupal", + "postgres-12", + "postgres-12-drupal", + "postgres-13", + "postgres-13-drupal", + "postgres-14", + "postgres-14-drupal", + "postgres-15", + "postgres-15-drupal", + "postgres-16", + "postgres-16-drupal" + ] +} + +group "python" { + targets = [ + "commons", + "python-3-8", + "python-3-9", + "python-3-10", + "python-3-11", + "python-3-12" + ] +} + +group "redis" { + targets = [ + "commons", + "redis-6", + "redis-6-persistent", + "redis-7", + "redis-7-persistent" + ] +} + +group "ruby" { + targets = [ + "commons", + "ruby-3-0", + "ruby-3-1", + "ruby-3-2" + ] +} + +group "solr" { + targets = [ + "commons", + "solr-7", + "solr-7-drupal", + "solr-8", + "solr-8-drupal" + ] +} + +group "varnish" { + targets = [ + "commons", + "varnish-6", + "varnish-6-drupal", + "varnish-6-persistent", + "varnish-6-persistent-drupal", + "varnish-7", + "varnish-7-drupal", + "varnish-7-persistent", + "varnish-7-persistent-drupal" + ] +} + +group "others" { + targets =[ + "commons", + "mongo-4", + "nginx", + "nginx-drupal", + "opensearch-2", + "rabbitmq", + "rabbitmq-cluster" + ] +} + +target "commons" { + inherits = ["default"] + context = "images/commons" + dockerfile = "Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/commons" + } + tags = ["${IMAGE_REPO}/commons:${TAG}"] +} + +target "mariadb-10-4" { + inherits = ["default"] + context = "images/mariadb" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "10.4.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.4" + } + tags = ["${IMAGE_REPO}/mariadb-10.4:${TAG}"] +} + +target "mariadb-10-4-drupal" { + inherits = ["default"] + context = "images/mariadb-drupal" + contexts = { + "lagoon/mariadb-10.4": "target:mariadb-10-4" + } + dockerfile = "10.4.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.4-drupal" + } + tags = ["${IMAGE_REPO}/mariadb-10.4-drupal:${TAG}"] +} + +target "mariadb-10-5" { + inherits = ["default"] + context = "images/mariadb" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "10.5.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.5" + } + tags = ["${IMAGE_REPO}/mariadb-10.5:${TAG}"] +} + +target "mariadb-10-5-drupal" { + inherits = ["default"] + context = "images/mariadb-drupal" + contexts = { + "lagoon/mariadb-10.5": "target:mariadb-10-5" + } + dockerfile = "10.5.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.4-drupal" + } + tags = ["${IMAGE_REPO}/mariadb-10.5-drupal:${TAG}"] +} + +target "mariadb-10-6" { + inherits = ["default"] + context = "images/mariadb" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "10.6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.6" + } + tags = ["${IMAGE_REPO}/mariadb-10.6:${TAG}"] +} + +target "mariadb-10-6-drupal" { + inherits = ["default"] + context = "images/mariadb-drupal" + contexts = { + "lagoon/mariadb-10.6": "target:mariadb-10-6" + } + dockerfile = "10.6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.6-drupal" + } + tags = ["${IMAGE_REPO}/mariadb-10.6-drupal:${TAG}"] +} + +target "mariadb-10-11" { + inherits = ["default"] + context = "images/mariadb" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "10.11.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.11" + } + tags = ["${IMAGE_REPO}/mariadb-10.11:${TAG}"] +} + +target "mariadb-10-11-drupal" { + inherits = ["default"] + context = "images/mariadb-drupal" + contexts = { + "lagoon/mariadb-10.11": "target:mariadb-10-6" + } + dockerfile = "10.11.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mariadb-10.11-drupal" + } + tags = ["${IMAGE_REPO}/mariadb-10.11-drupal:${TAG}"] +} + +target "mongo-4" { + inherits = ["default"] + context = "images/mongo" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "4.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/mongo-4" + } + tags = ["${IMAGE_REPO}/mongo-4:${TAG}"] +} + +target "nginx" { + inherits = ["default"] + context = "images/nginx" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/nginx" + } + tags = ["${IMAGE_REPO}/nginx:${TAG}"] +} + +target "nginx-drupal" { + inherits = ["default"] + context = "images/nginx-drupal" + contexts = { + "lagoon/nginx": "target:nginx" + } + dockerfile = "Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/nginx-drupal" + } + tags = ["${IMAGE_REPO}/nginx:${TAG}"] +} + +target "node-18" { + inherits = ["default"] + context = "images/node" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "18.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/node-18" + } + tags = ["${IMAGE_REPO}/node-18:${TAG}"] +} + +target "node-18-builder" { + inherits = ["default"] + context = "images/node-builder" + contexts = { + "lagoon/node-18": "target:node-18" + } + dockerfile = "18.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/node-18-builder" + } + tags = ["${IMAGE_REPO}/node-18-builder:${TAG}"] +} + +target "node-18-cli" { + inherits = ["default"] + context = "images/node-cli" + contexts = { + "lagoon/node-18": "target:node-18" + } + dockerfile = "18.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/node-18-cli" + } + tags = ["${IMAGE_REPO}/node-18-cli:${TAG}"] +} + +target "node-20" { + inherits = ["default"] + context = "images/node" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "20.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/node-20" + } + tags = ["${IMAGE_REPO}/node-20:${TAG}"] +} + +target "node-20-builder" { + inherits = ["default"] + context = "images/node-builder" + contexts = { + "lagoon/node-20": "target:node-20" + } + dockerfile = "20.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/node-20-builder" + } + tags = ["${IMAGE_REPO}/node-20-builder:${TAG}"] +} + +target "node-20-cli" { + inherits = ["default"] + context = "images/node-cli" + contexts = { + "lagoon/node-20": "target:node-20" + } + dockerfile = "20.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/node-20-cli" + } + tags = ["${IMAGE_REPO}/node-20-cli:${TAG}"] +} + +target "opensearch-2" { + inherits = ["default"] + context = "images/opensearch" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "2.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/opensearch-2" + } + tags = ["${IMAGE_REPO}/opensearch-2:${TAG}"] +} + +target "php-8-0-fpm" { + inherits = ["default"] + context = "images/php-fpm" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "8.0.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.0-fpm" + } + tags = ["${IMAGE_REPO}/php-8.0-fpm:${TAG}"] +} + +target "php-8-0-cli" { + inherits = ["default"] + context = "images/php-cli" + contexts = { + "lagoon/php-8.0-fpm": "target:php-8-0-fpm" + } + dockerfile = "8.0.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.0-cli" + } + tags = ["${IMAGE_REPO}/php-8.0-cli:${TAG}"] +} + +target "php-8-0-cli-drupal" { + inherits = ["default"] + context = "images/php-cli-drupal" + contexts = { + "lagoon/php-8.0-cli": "target:php-8-0-cli" + } + dockerfile = "8.0.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.0-cli-drupal" + } + tags = ["${IMAGE_REPO}/php-8.0-cli-drupal:${TAG}"] +} + +target "php-8-1-fpm" { + inherits = ["default"] + context = "images/php-fpm" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "8.1.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.1-fpm" + } + tags = ["${IMAGE_REPO}/php-8.1-fpm:${TAG}"] +} + +target "php-8-1-cli" { + inherits = ["default"] + context = "images/php-cli" + contexts = { + "lagoon/php-8.1-fpm": "target:php-8-1-fpm" + } + dockerfile = "8.1.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.1-cli" + } + tags = ["${IMAGE_REPO}/php-8.1-cli:${TAG}"] +} + +target "php-8-1-cli-drupal" { + inherits = ["default"] + context = "images/php-cli-drupal" + contexts = { + "lagoon/php-8.1-cli": "target:php-8-1-cli" + } + dockerfile = "8.1.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.1-cli-drupal" + } + tags = ["${IMAGE_REPO}/php-8.1-cli-drupal:${TAG}"] +} + +target "php-8-2-fpm" { + inherits = ["default"] + context = "images/php-fpm" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "8.2.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.2-fpm" + } + tags = ["${IMAGE_REPO}/php-8.2-fpm:${TAG}"] +} + +target "php-8-2-cli" { + inherits = ["default"] + context = "images/php-cli" + contexts = { + "lagoon/php-8.2-fpm": "target:php-8-2-fpm" + } + dockerfile = "8.2.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.2-cli" + } + tags = ["${IMAGE_REPO}/php-8.2-cli:${TAG}"] +} + +target "php-8-2-cli-drupal" { + inherits = ["default"] + context = "images/php-cli-drupal" + contexts = { + "lagoon/php-8.2-cli": "target:php-8-2-cli" + } + dockerfile = "8.2.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/php-8.2-cli-drupal" + } + tags = ["${IMAGE_REPO}/php-8.2-cli-drupal:${TAG}"] +} + +target "postgres-11" { + inherits = ["default"] + context = "images/postgres" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "11.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-11" + } + tags = ["${IMAGE_REPO}/postgres-11:${TAG}"] +} + +target "postgres-11-drupal" { + inherits = ["default"] + context = "images/postgres-drupal" + contexts = { + "lagoon/postgres-11": "target:postgres-11" + } + dockerfile = "11.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-11-drupal" + } + tags = ["${IMAGE_REPO}/postgres-11-drupal:${TAG}"] +} + +target "postgres-11-ckan" { + inherits = ["default"] + context = "images/postgres-ckan" + contexts = { + "lagoon/postgres-11": "target:postgres-11" + } + dockerfile = "11.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-11-ckan" + } + tags = ["${IMAGE_REPO}/postgres-11-ckan:${TAG}"] +} + +target "postgres-12" { + inherits = ["default"] + context = "images/postgres" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "12.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-12" + } + tags = ["${IMAGE_REPO}/postgres-12:${TAG}"] +} + +target "postgres-12-drupal" { + inherits = ["default"] + context = "images/postgres-drupal" + contexts = { + "lagoon/postgres-12": "target:postgres-12" + } + dockerfile = "12.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-12-drupal" + } + tags = ["${IMAGE_REPO}/postgres-12-drupal:${TAG}"] +} + +target "postgres-13" { + inherits = ["default"] + context = "images/postgres" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "13.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-13" + } + tags = ["${IMAGE_REPO}/postgres-13:${TAG}"] +} + +target "postgres-13-drupal" { + inherits = ["default"] + context = "images/postgres-drupal" + contexts = { + "lagoon/postgres-13": "target:postgres-13" + } + dockerfile = "13.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-13-drupal" + } + tags = ["${IMAGE_REPO}/postgres-13-drupal:${TAG}"] +} + +target "postgres-14" { + inherits = ["default"] + context = "images/postgres" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "14.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-14" + } + tags = ["${IMAGE_REPO}/postgres-14:${TAG}"] +} + +target "postgres-14-drupal" { + inherits = ["default"] + context = "images/postgres-drupal" + contexts = { + "lagoon/postgres-14": "target:postgres-14" + } + dockerfile = "14.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-14-drupal" + } + tags = ["${IMAGE_REPO}/postgres-14-drupal:${TAG}"] +} + +target "postgres-15" { + inherits = ["default"] + context = "images/postgres" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "15.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-15" + } + tags = ["${IMAGE_REPO}/postgres-15:${TAG}"] +} + +target "postgres-15-drupal" { + inherits = ["default"] + context = "images/postgres-drupal" + contexts = { + "lagoon/postgres-15": "target:postgres-15" + } + dockerfile = "15.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-15-drupal" + } + tags = ["${IMAGE_REPO}/postgres-15-drupal:${TAG}"] +} + +target "postgres-16" { + inherits = ["default"] + context = "images/postgres" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "16.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-16" + } + tags = ["${IMAGE_REPO}/postgres-16:${TAG}"] +} + +target "postgres-16-drupal" { + inherits = ["default"] + context = "images/postgres-drupal" + contexts = { + "lagoon/postgres-16": "target:postgres-16" + } + dockerfile = "16.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/postgres-16-drupal" + } + tags = ["${IMAGE_REPO}/postgres-16-drupal:${TAG}"] +} + +target "python-3-8" { + inherits = ["default"] + context = "images/python" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.8.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/python-3.8" + } + tags = ["${IMAGE_REPO}/python-3.8:${TAG}"] +} + +target "python-3-9" { + inherits = ["default"] + context = "images/python" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.9.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/python-3.9" + } + tags = ["${IMAGE_REPO}/python-3.9:${TAG}"] +} + +target "python-3-10" { + inherits = ["default"] + context = "images/python" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.10.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/python-3.10" + } + tags = ["${IMAGE_REPO}/python-3.10:${TAG}"] +} + +target "python-3-11" { + inherits = ["default"] + context = "images/python" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.11.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/python-3.11" + } + tags = ["${IMAGE_REPO}/python-3.11:${TAG}"] +} + +target "python-3-12" { + inherits = ["default"] + context = "images/python" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.12.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/python-3.12" + } + tags = ["${IMAGE_REPO}/python-3.12:${TAG}"] +} + +target "rabbitmq" { + inherits = ["default"] + context = "images/rabbitmq" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/rabbitmq" + } + tags = ["${IMAGE_REPO}/rabbitmq:${TAG}"] +} + +target "rabbitmq-cluster" { + inherits = ["default"] + context = "images/rabbitmq-cluster" + contexts = { + "lagoon/rabbitmq": "target:rabbitmq" + } + dockerfile = "Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/rabbitmq-cluster" + } + tags = ["${IMAGE_REPO}/rabbitmq-cluster:${TAG}"] +} + +target "redis-6" { + inherits = ["default"] + context = "images/redis" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/redis-6" + } + tags = ["${IMAGE_REPO}/redis-6:${TAG}"] +} + +target "redis-6-persistent" { + inherits = ["default"] + context = "images/redis-persistent" + contexts = { + "lagoon/redis-6": "target:commons" + } + dockerfile = "6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/redis-6-persistent" + } + tags = ["${IMAGE_REPO}/redis-6-persistent:${TAG}"] +} + +target "redis-7" { + inherits = ["default"] + context = "images/redis" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/redis-7" + } + tags = ["${IMAGE_REPO}/redis-7:${TAG}"] +} + +target "redis-7-persistent" { + inherits = ["default"] + context = "images/redis-persistent" + contexts = { + "lagoon/redis-7": "target:commons" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/redis-7-persistent" + } + tags = ["${IMAGE_REPO}/redis-7-persistent:${TAG}"] +} + +target "ruby-3-0" { + inherits = ["default"] + context = "images/ruby" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.0.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/ruby-3.0" + } + tags = ["${IMAGE_REPO}/ruby-3.0:${TAG}"] +} + +target "ruby-3-1" { + inherits = ["default"] + context = "images/ruby" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.1.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/ruby-3.1" + } + tags = ["${IMAGE_REPO}/ruby-3.1:${TAG}"] +} + +target "ruby-3-2" { + inherits = ["default"] + context = "images/ruby" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "3.2.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/ruby-3.2" + } + tags = ["${IMAGE_REPO}/ruby-3.2:${TAG}"] +} + +target "solr-7" { + inherits = ["default"] + context = "images/solr" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/solr-7" + } + tags = ["${IMAGE_REPO}/solr-7:${TAG}"] +} + +target "solr-7-drupal" { + inherits = ["default"] + context = "images/solr-drupal" + contexts = { + "lagoon/solr-7": "target:solr-7" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/solr-7-drupal" + } + tags = ["${IMAGE_REPO}/solr-7-drupal:${TAG}"] +} + +target "solr-8" { + inherits = ["default"] + context = "images/solr" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "8.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/solr-8" + } + tags = ["${IMAGE_REPO}/solr-8:${TAG}"] +} + +target "solr-8-drupal" { + inherits = ["default"] + context = "images/solr-drupal" + contexts = { + "lagoon/solr-8": "target:solr-8" + } + dockerfile = "8.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/solr-8-drupal" + } + tags = ["${IMAGE_REPO}/solr-8-drupal:${TAG}"] +} + +target "varnish-6" { + inherits = ["default"] + context = "images/varnish" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-6" + } + tags = ["${IMAGE_REPO}/varnish-6:${TAG}"] +} + +target "varnish-6-drupal" { + inherits = ["default"] + context = "images/varnish-drupal" + contexts = { + "lagoon/varnish-6": "target:varnish-6" + } + dockerfile = "6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-6-drupal" + } + tags = ["${IMAGE_REPO}/varnish-6-drupal:${TAG}"] +} + +target "varnish-6-persistent" { + inherits = ["default"] + context = "images/varnish-persistent" + contexts = { + "lagoon/varnish-6": "target:varnish-6" + } + dockerfile = "6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-6-persistent" + } + tags = ["${IMAGE_REPO}/varnish-6-persistent:${TAG}"] +} + +target "varnish-6-persistent-drupal" { + inherits = ["default"] + context = "images/varnish-persistent-drupal" + contexts = { + "lagoon/varnish-6-drupal": "target:varnish-6-drupal" + } + dockerfile = "6.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-6-persistent-drupal" + } + tags = ["${IMAGE_REPO}/varnish-6-persistent-drupal:${TAG}"] +} + +target "varnish-7" { + inherits = ["default"] + context = "images/varnish" + contexts = { + "lagoon/commons": "target:commons" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-7" + } + tags = ["${IMAGE_REPO}/varnish-7:${TAG}"] +} + +target "varnish-7-drupal" { + inherits = ["default"] + context = "images/varnish-drupal" + contexts = { + "lagoon/varnish-7": "target:varnish-7" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-7-drupal" + } + tags = ["${IMAGE_REPO}/varnish-7-drupal:${TAG}"] +} + +target "varnish-7-persistent" { + inherits = ["default"] + context = "images/varnish-persistent" + contexts = { + "lagoon/varnish-7": "target:varnish-7" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-7-persistent" + } + tags = ["${IMAGE_REPO}/varnish-7-persistent:${TAG}"] +} + +target "varnish-7-persistent-drupal" { + inherits = ["default"] + context = "images/varnish-persistent-drupal" + contexts = { + "lagoon/varnish-7-drupal": "target:varnish-7-drupal" + } + dockerfile = "7.Dockerfile" + labels = { + "org.opencontainers.image.title": "lagoon-images/varnish-7-persistent-drupal" + } + tags = ["${IMAGE_REPO}/varnish-7-persistent-drupal:${TAG}"] +} diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile index 8fd7d70ba..1d71b3082 100644 --- a/images/commons/Dockerfile +++ b/images/commons/Dockerfile @@ -3,9 +3,6 @@ FROM amazeeio/envplate:v1.0.3 AS envplate FROM alpine:3.18.5 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=commons COPY lagoon/ /lagoon/ diff --git a/images/mariadb-drupal/10.11.Dockerfile b/images/mariadb-drupal/10.11.Dockerfile index da3335e1b..7e6849acb 100644 --- a/images/mariadb-drupal/10.11.Dockerfile +++ b/images/mariadb-drupal/10.11.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/mariadb-10.11 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/mariadb-10.11:${IMAGE_TAG:-latest} ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb-drupal/10.4.Dockerfile b/images/mariadb-drupal/10.4.Dockerfile index 675cf20b5..90c986204 100644 --- a/images/mariadb-drupal/10.4.Dockerfile +++ b/images/mariadb-drupal/10.4.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/mariadb-10.4 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/mariadb-10.4:${IMAGE_TAG:-latest} ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb-drupal/10.5.Dockerfile b/images/mariadb-drupal/10.5.Dockerfile index 210c1733e..a4571b4f3 100644 --- a/images/mariadb-drupal/10.5.Dockerfile +++ b/images/mariadb-drupal/10.5.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/mariadb-10.5 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/mariadb-10.5:${IMAGE_TAG:-latest} ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb-drupal/10.6.Dockerfile b/images/mariadb-drupal/10.6.Dockerfile index 4835214fa..9336a95be 100644 --- a/images/mariadb-drupal/10.6.Dockerfile +++ b/images/mariadb-drupal/10.6.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/mariadb-10.6 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/mariadb-10.6:${IMAGE_TAG:-latest} ENV MARIADB_DATABASE=drupal \ MARIADB_USER=drupal \ diff --git a/images/mariadb/10.11.Dockerfile b/images/mariadb/10.11.Dockerfile index 732facaee..4c8f8567e 100644 --- a/images/mariadb/10.11.Dockerfile +++ b/images/mariadb/10.11.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM alpine:3.18.5 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM alpine:3.18.5 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/mariadb/10.4.Dockerfile b/images/mariadb/10.4.Dockerfile index 18b994871..424077c05 100644 --- a/images/mariadb/10.4.Dockerfile +++ b/images/mariadb/10.4.Dockerfile @@ -1,10 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -# Held at 3.12.x to ensure mariadb 10.4 whilst we evaluate upgrade path -FROM alpine:3.12.12 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +# Held at 3.12.x to ensure mariadb 10.4 +FROM alpine:3.12.12 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/mariadb/10.5.Dockerfile b/images/mariadb/10.5.Dockerfile index 3eb46b33c..5ac0b3058 100644 --- a/images/mariadb/10.5.Dockerfile +++ b/images/mariadb/10.5.Dockerfile @@ -1,11 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -# Held at 3.14.x to ensure mariadb 10.5 whilst we evaluate upgrade path +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM alpine:3.14.10 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/mariadb/10.6.Dockerfile b/images/mariadb/10.6.Dockerfile index 530296999..95f7b27a8 100644 --- a/images/mariadb/10.6.Dockerfile +++ b/images/mariadb/10.6.Dockerfile @@ -1,10 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -# Held at 3.17.x to ensure mariadb 10.6 whilst we evaluate upgrade path -FROM alpine:3.17.6 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +# Held at 3.17.x to ensure mariadb 10.6 +FROM alpine:3.17.6 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/mongo/4.Dockerfile b/images/mongo/4.Dockerfile index 74d10c43b..666977542 100644 --- a/images/mongo/4.Dockerfile +++ b/images/mongo/4.Dockerfile @@ -1,10 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM --platform=linux/amd64 ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM alpine:3.18.5 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=mongo ARG LAGOON_VERSION diff --git a/images/nginx-drupal/Dockerfile b/images/nginx-drupal/Dockerfile index db78c85cd..635b1d443 100644 --- a/images/nginx-drupal/Dockerfile +++ b/images/nginx-drupal/Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/nginx - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/nginx:${IMAGE_TAG:-latest} ENV LAGOON=nginx diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index 2c60f1043..5d0b0c50b 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -1,10 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM openresty/openresty:1.21.4.3-2-alpine -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=nginx ARG LAGOON_VERSION diff --git a/images/node-builder/18.Dockerfile b/images/node-builder/18.Dockerfile index 0526da17c..391b42a01 100644 --- a/images/node-builder/18.Dockerfile +++ b/images/node-builder/18.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/node-18 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/node-18:${IMAGE_TAG:-latest} ENV LAGOON=node diff --git a/images/node-builder/20.Dockerfile b/images/node-builder/20.Dockerfile index e1dad3f41..6d2e3c4b7 100644 --- a/images/node-builder/20.Dockerfile +++ b/images/node-builder/20.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/node-20 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/node-20:${IMAGE_TAG:-latest} ENV LAGOON=node diff --git a/images/node-cli/18.Dockerfile b/images/node-cli/18.Dockerfile index 4dcff8f0e..1982b16e4 100644 --- a/images/node-cli/18.Dockerfile +++ b/images/node-cli/18.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/node-18 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/node-18:${IMAGE_TAG:-latest} ENV LAGOON=node diff --git a/images/node-cli/20.Dockerfile b/images/node-cli/20.Dockerfile index f81030eb2..7f56f3cf2 100644 --- a/images/node-cli/20.Dockerfile +++ b/images/node-cli/20.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/node-20 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/node-20:${IMAGE_TAG:-latest} ENV LAGOON=node diff --git a/images/node/18.Dockerfile b/images/node/18.Dockerfile index 2f44c8898..3c4c8cfa7 100644 --- a/images/node/18.Dockerfile +++ b/images/node/18.Dockerfile @@ -1,10 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM node:18.19-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=node ARG LAGOON_VERSION diff --git a/images/node/20.Dockerfile b/images/node/20.Dockerfile index 8db922e29..cc491de15 100644 --- a/images/node/20.Dockerfile +++ b/images/node/20.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM node:20.10-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM node:20.10-alpine3.18 ENV LAGOON=node diff --git a/images/opensearch/2.Dockerfile b/images/opensearch/2.Dockerfile index 11219ea2e..9b4e6640f 100644 --- a/images/opensearch/2.Dockerfile +++ b/images/opensearch/2.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM opensearchproject/opensearch:2.11.1 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM opensearchproject/opensearch:2.11.1 ENV LAGOON=opensearch diff --git a/images/php-cli-drupal/8.0.Dockerfile b/images/php-cli-drupal/8.0.Dockerfile index 83ec3279e..108518875 100644 --- a/images/php-cli-drupal/8.0.Dockerfile +++ b/images/php-cli-drupal/8.0.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/php-8.0-cli - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/php-8.0-cli:${IMAGE_TAG:-latest} ENV LAGOON=cli-drupal diff --git a/images/php-cli-drupal/8.1.Dockerfile b/images/php-cli-drupal/8.1.Dockerfile index 40876dcdc..51bf9105f 100644 --- a/images/php-cli-drupal/8.1.Dockerfile +++ b/images/php-cli-drupal/8.1.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/php-8.1-cli - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/php-8.1-cli:${IMAGE_TAG:-latest} ENV LAGOON=cli-drupal diff --git a/images/php-cli-drupal/8.2.Dockerfile b/images/php-cli-drupal/8.2.Dockerfile index 414649f41..8d99adb9a 100644 --- a/images/php-cli-drupal/8.2.Dockerfile +++ b/images/php-cli-drupal/8.2.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/php-8.2-cli - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/php-8.2-cli:${IMAGE_TAG:-latest} ENV LAGOON=cli-drupal diff --git a/images/php-cli/8.0.Dockerfile b/images/php-cli/8.0.Dockerfile index 8c761c450..be1f53664 100644 --- a/images/php-cli/8.0.Dockerfile +++ b/images/php-cli/8.0.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/php-8.0-fpm - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/php-8.0-fpm:${IMAGE_TAG:-latest} ENV LAGOON=cli diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile index e2600f5cc..3098ec51f 100644 --- a/images/php-cli/8.1.Dockerfile +++ b/images/php-cli/8.1.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/php-8.1-fpm - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/php-8.1-fpm:${IMAGE_TAG:-latest} ENV LAGOON=cli diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile index ca1ae47a0..34b26f754 100644 --- a/images/php-cli/8.2.Dockerfile +++ b/images/php-cli/8.2.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/php-8.2-fpm - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/php-8.2-fpm:${IMAGE_TAG:-latest} ENV LAGOON=cli diff --git a/images/php-fpm/8.0.Dockerfile b/images/php-fpm/8.0.Dockerfile index 08bcfbc0b..c5ba48c25 100644 --- a/images/php-fpm/8.0.Dockerfile +++ b/images/php-fpm/8.0.Dockerfile @@ -1,5 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM composer:latest as healthcheckbuilder @@ -7,9 +8,6 @@ RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 # Alpine 3.18 image not available for PHP 8.0 FROM php:8.0.30-fpm-alpine3.16 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=php ARG LAGOON_VERSION diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index cb6157c5c..d33e87d1c 100644 --- a/images/php-fpm/8.1.Dockerfile +++ b/images/php-fpm/8.1.Dockerfile @@ -1,5 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM composer:latest as healthcheckbuilder @@ -7,9 +8,6 @@ RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 FROM php:8.1.26-fpm-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=php ARG LAGOON_VERSION diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index c9d056399..ed7ab7a6c 100644 --- a/images/php-fpm/8.2.Dockerfile +++ b/images/php-fpm/8.2.Dockerfile @@ -1,5 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM composer:latest as healthcheckbuilder @@ -7,9 +8,6 @@ RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 FROM php:8.2.13-fpm-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=php ARG LAGOON_VERSION diff --git a/images/postgres-ckan/11.Dockerfile b/images/postgres-ckan/11.Dockerfile index f99f6d578..a55a0759d 100644 --- a/images/postgres-ckan/11.Dockerfile +++ b/images/postgres-ckan/11.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-11 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-11:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/11.Dockerfile b/images/postgres-drupal/11.Dockerfile index 4ab39c397..3a537dca0 100644 --- a/images/postgres-drupal/11.Dockerfile +++ b/images/postgres-drupal/11.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-11 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-11:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/12.Dockerfile b/images/postgres-drupal/12.Dockerfile index 71b31a3cc..9e8975530 100644 --- a/images/postgres-drupal/12.Dockerfile +++ b/images/postgres-drupal/12.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-12 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-12:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/13.Dockerfile b/images/postgres-drupal/13.Dockerfile index 88aacb30b..7d5b76a73 100644 --- a/images/postgres-drupal/13.Dockerfile +++ b/images/postgres-drupal/13.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-13 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-13:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/14.Dockerfile b/images/postgres-drupal/14.Dockerfile index 088d81f46..5245cfd54 100644 --- a/images/postgres-drupal/14.Dockerfile +++ b/images/postgres-drupal/14.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-14 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-14:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/15.Dockerfile b/images/postgres-drupal/15.Dockerfile index 9ac5cc05e..a92ab3ac5 100644 --- a/images/postgres-drupal/15.Dockerfile +++ b/images/postgres-drupal/15.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-15 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-15:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres-drupal/16.Dockerfile b/images/postgres-drupal/16.Dockerfile index 129bb9f8b..9c8ce62e5 100644 --- a/images/postgres-drupal/16.Dockerfile +++ b/images/postgres-drupal/16.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/postgres-16 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/postgres-16:${IMAGE_TAG:-latest} # change log_min_error_statement and log_min_messages from `error` to `log` as drupal is prone to cause some errors which are all logged (yes `log` is a less verbose mode than `error`) RUN sed -i "s/#log_min_error_statement = error/log_min_error_statement = log/" /usr/local/share/postgresql/postgresql.conf.sample \ diff --git a/images/postgres/11.Dockerfile b/images/postgres/11.Dockerfile index e04cc74b5..984f32daa 100644 --- a/images/postgres/11.Dockerfile +++ b/images/postgres/11.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:11.22-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM postgres:11.22-alpine3.18 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/postgres/12.Dockerfile b/images/postgres/12.Dockerfile index 0ad5995f4..a6538ebcc 100644 --- a/images/postgres/12.Dockerfile +++ b/images/postgres/12.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:12.17-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM postgres:12.17-alpine3.18 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/postgres/13.Dockerfile b/images/postgres/13.Dockerfile index 71aebfca4..97a0fd513 100644 --- a/images/postgres/13.Dockerfile +++ b/images/postgres/13.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:13.13-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM postgres:13.10-alpine3.17 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/postgres/14.Dockerfile b/images/postgres/14.Dockerfile index e3b67dd35..ee0c6d957 100644 --- a/images/postgres/14.Dockerfile +++ b/images/postgres/14.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:14.10-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM postgres:14.10-alpine3.18 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/postgres/15.Dockerfile b/images/postgres/15.Dockerfile index cb2bc30d9..13145d24a 100644 --- a/images/postgres/15.Dockerfile +++ b/images/postgres/15.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:15.5-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM postgres:15.5-alpine3.18 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/postgres/16.Dockerfile b/images/postgres/16.Dockerfile index 224808f03..669eb2b17 100644 --- a/images/postgres/16.Dockerfile +++ b/images/postgres/16.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM postgres:16.1-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM postgres:16.1-alpine3.18 ARG LAGOON_VERSION ENV LAGOON_VERSION=$LAGOON_VERSION diff --git a/images/python/3.10.Dockerfile b/images/python/3.10.Dockerfile index dcdef88f3..0ddd06161 100644 --- a/images/python/3.10.Dockerfile +++ b/images/python/3.10.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM python:3.10.13-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=python # Copy commons files diff --git a/images/python/3.11.Dockerfile b/images/python/3.11.Dockerfile index a6a01293c..fe1f67e5e 100644 --- a/images/python/3.11.Dockerfile +++ b/images/python/3.11.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM python:3.11.6-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=python # Copy commons files diff --git a/images/python/3.12.Dockerfile b/images/python/3.12.Dockerfile index cc868aa10..02a3a3750 100644 --- a/images/python/3.12.Dockerfile +++ b/images/python/3.12.Dockerfile @@ -1,12 +1,13 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM python:3.12.0-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ENV LAGOON=node -ENV LAGOON=python +ARG LAGOON_VERSION +ENV LAGOON_VERSION=$LAGOON_VERSION # Copy commons files COPY --from=commons /lagoon /lagoon diff --git a/images/python/3.8.Dockerfile b/images/python/3.8.Dockerfile index 2f80770e3..4519f8323 100644 --- a/images/python/3.8.Dockerfile +++ b/images/python/3.8.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM python:3.8.18-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=python # Copy commons files diff --git a/images/python/3.9.Dockerfile b/images/python/3.9.Dockerfile index d5c7ece89..0c324de9c 100644 --- a/images/python/3.9.Dockerfile +++ b/images/python/3.9.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM python:3.9.18-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=python # Copy commons files diff --git a/images/rabbitmq-cluster/Dockerfile b/images/rabbitmq-cluster/Dockerfile index e1750ceb8..d31780faf 100644 --- a/images/rabbitmq-cluster/Dockerfile +++ b/images/rabbitmq-cluster/Dockerfile @@ -1,9 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/rabbitmq +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/rabbitmq:${IMAGE_TAG:-latest} RUN rabbitmq-plugins --offline enable rabbitmq_peer_discovery_k8s - ADD enabled_plugins /etc/rabbitmq/enabled_plugins ADD rabbitmq.conf /etc/rabbitmq/rabbitmq.conf RUN fix-permissions /etc/rabbitmq/rabbitmq.conf diff --git a/images/rabbitmq/Dockerfile b/images/rabbitmq/Dockerfile index a0c63efc2..0de8bad3d 100644 --- a/images/rabbitmq/Dockerfile +++ b/images/rabbitmq/Dockerfile @@ -1,5 +1,7 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons + FROM rabbitmq:3.10.25-management-alpine ARG LAGOON_VERSION diff --git a/images/redis-persistent/6.Dockerfile b/images/redis-persistent/6.Dockerfile index aff841d8e..d30b0a83d 100644 --- a/images/redis-persistent/6.Dockerfile +++ b/images/redis-persistent/6.Dockerfile @@ -1,7 +1,5 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/redis-6 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/redis-6:${IMAGE_TAG:-latest} ENV FLAVOR=persistent diff --git a/images/redis-persistent/7.Dockerfile b/images/redis-persistent/7.Dockerfile index 3fbad6070..d835327b6 100644 --- a/images/redis-persistent/7.Dockerfile +++ b/images/redis-persistent/7.Dockerfile @@ -1,7 +1,5 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/redis-7 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/redis-7:${IMAGE_TAG:-latest} ENV FLAVOR=persistent diff --git a/images/redis/6.Dockerfile b/images/redis/6.Dockerfile index bbf3b22ee..2f2cfc6ec 100644 --- a/images/redis/6.Dockerfile +++ b/images/redis/6.Dockerfile @@ -1,10 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM redis:6.2.14-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=redis ENV FLAVOR=ephemeral diff --git a/images/redis/7.Dockerfile b/images/redis/7.Dockerfile index a811b9392..bacd3a51b 100644 --- a/images/redis/7.Dockerfile +++ b/images/redis/7.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM redis:7.2.3-alpine3.18 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM redis:7.2.3-alpine3.18 ENV LAGOON=redis ENV FLAVOR=ephemeral diff --git a/images/ruby/3.0.Dockerfile b/images/ruby/3.0.Dockerfile index 527497d4b..a83424bb0 100644 --- a/images/ruby/3.0.Dockerfile +++ b/images/ruby/3.0.Dockerfile @@ -1,11 +1,10 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons + # Alpine 3.18 image not available for Ruby 3.0 FROM ruby:3.0.6-alpine3.16 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=ruby # Copy commons files diff --git a/images/ruby/3.1.Dockerfile b/images/ruby/3.1.Dockerfile index b99276433..d89f5154c 100644 --- a/images/ruby/3.1.Dockerfile +++ b/images/ruby/3.1.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM ruby:3.1.4-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=ruby # Copy commons files diff --git a/images/ruby/3.2.Dockerfile b/images/ruby/3.2.Dockerfile index b0ea530f3..08517faba 100644 --- a/images/ruby/3.2.Dockerfile +++ b/images/ruby/3.2.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM ruby:3.2.2-alpine3.18 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=ruby # Copy commons files diff --git a/images/solr-drupal/7.Dockerfile b/images/solr-drupal/7.Dockerfile index 3aae4d634..6eaaa1e40 100644 --- a/images/solr-drupal/7.Dockerfile +++ b/images/solr-drupal/7.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/solr-7 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/solr-7:${IMAGE_TAG:-latest} COPY drupal-4.1.1-solr-7.x-0 /solr-conf diff --git a/images/solr-drupal/8.Dockerfile b/images/solr-drupal/8.Dockerfile index dde7f4336..a7f7554fc 100644 --- a/images/solr-drupal/8.Dockerfile +++ b/images/solr-drupal/8.Dockerfile @@ -1,5 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/solr-8 +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/solr-8:${IMAGE_TAG:-latest} COPY drupal-4.1.1-solr-8.x-0 /solr-conf diff --git a/images/solr/7.Dockerfile b/images/solr/7.Dockerfile index 989bef135..f6a7de04e 100644 --- a/images/solr/7.Dockerfile +++ b/images/solr/7.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM solr:7.7.3-slim +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM solr:7.7.3-slim ENV LAGOON=solr diff --git a/images/solr/8.Dockerfile b/images/solr/8.Dockerfile index f3d2b17cc..1bc493a6e 100755 --- a/images/solr/8.Dockerfile +++ b/images/solr/8.Dockerfile @@ -1,9 +1,8 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons -FROM solr:8.11.2-slim +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +FROM solr:8.11.2-slim ENV LAGOON=solr ENV SOLR_DATA_HOME=/var/solr diff --git a/images/varnish-drupal/6.Dockerfile b/images/varnish-drupal/6.Dockerfile index c8b48c910..e4a7a07cb 100644 --- a/images/varnish-drupal/6.Dockerfile +++ b/images/varnish-drupal/6.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/varnish-6 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/varnish-6:${IMAGE_TAG:-latest} USER root diff --git a/images/varnish-drupal/7.Dockerfile b/images/varnish-drupal/7.Dockerfile index cdeabc4c9..d79dea290 100644 --- a/images/varnish-drupal/7.Dockerfile +++ b/images/varnish-drupal/7.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/varnish-7 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/varnish-7:${IMAGE_TAG:-latest} USER root diff --git a/images/varnish-persistent-drupal/6.Dockerfile b/images/varnish-persistent-drupal/6.Dockerfile index 191dee774..05394641a 100644 --- a/images/varnish-persistent-drupal/6.Dockerfile +++ b/images/varnish-persistent-drupal/6.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/varnish-6-drupal - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/varnish-6-drupal:${IMAGE_TAG:-latest} VOLUME /var/cache/varnish diff --git a/images/varnish-persistent-drupal/7.Dockerfile b/images/varnish-persistent-drupal/7.Dockerfile index 50525e7cd..9fa1104b9 100644 --- a/images/varnish-persistent-drupal/7.Dockerfile +++ b/images/varnish-persistent-drupal/7.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/varnish-7-drupal - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/varnish-7-drupal:${IMAGE_TAG:-latest} VOLUME /var/cache/varnish diff --git a/images/varnish-persistent/6.Dockerfile b/images/varnish-persistent/6.Dockerfile index 0c95ee709..f5ee209ea 100644 --- a/images/varnish-persistent/6.Dockerfile +++ b/images/varnish-persistent/6.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/varnish-6 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/varnish-6:${IMAGE_TAG:-latest} VOLUME /var/cache/varnish diff --git a/images/varnish-persistent/7.Dockerfile b/images/varnish-persistent/7.Dockerfile index 01f2cc311..f2082a2d2 100644 --- a/images/varnish-persistent/7.Dockerfile +++ b/images/varnish-persistent/7.Dockerfile @@ -1,8 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/varnish-7 - -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/varnish-7:${IMAGE_TAG:-latest} VOLUME /var/cache/varnish diff --git a/images/varnish/6.Dockerfile b/images/varnish/6.Dockerfile index b59078eb2..2b9c1162b 100644 --- a/images/varnish/6.Dockerfile +++ b/images/varnish/6.Dockerfile @@ -1,5 +1,6 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM varnish:6.0.12 as vmod @@ -33,9 +34,6 @@ RUN cd /tmp && curl -sSLO https://github.com/varnish/varnish-modules/archive/${V FROM varnish:6.0.12 -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=varnish ARG LAGOON_VERSION diff --git a/images/varnish/7.Dockerfile b/images/varnish/7.Dockerfile index 5e7801ba2..bc0ad944a 100644 --- a/images/varnish/7.Dockerfile +++ b/images/varnish/7.Dockerfile @@ -1,11 +1,9 @@ ARG IMAGE_REPO -FROM ${IMAGE_REPO:-lagoon}/commons as commons +ARG IMAGE_TAG +FROM ${IMAGE_REPO:-lagoon}/commons:${IMAGE_TAG:-latest} as commons FROM varnish:7.4-alpine -LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" -LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" - ENV LAGOON=varnish ARG LAGOON_VERSION