From 51eae235d1c3014b58ce169483ab4d6423bce635 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Thu, 16 Sep 2021 14:11:45 +1000 Subject: [PATCH] DCKUBE-707: Update the OpenJDK base images to use the project repo, as the Docker "official" images are no longer updated. --- Dockerfile | 2 +- bitbucket-pipelines.yml | 48 ++++++++++++++++++++--------------------- pipelines-generator.py | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index e470ef7..7321d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=adoptopenjdk:11-hotspot +ARG BASE_IMAGE=adoptopenjdk/openjdk11 FROM $BASE_IMAGE LABEL maintainer="dc-deployments@atlassian.com" diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index f0e23e6..e52e66c 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -41,7 +41,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -66,7 +66,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -91,7 +91,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -116,7 +116,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -141,7 +141,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -166,7 +166,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -191,7 +191,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -216,7 +216,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -241,7 +241,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -266,7 +266,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -291,7 +291,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -316,7 +316,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -403,7 +403,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -429,7 +429,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -455,7 +455,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -481,7 +481,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -507,7 +507,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -533,7 +533,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -559,7 +559,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -585,7 +585,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -611,7 +611,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -637,7 +637,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -663,7 +663,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ @@ -689,7 +689,7 @@ pipelines: --end-version='8' \ --default-release \ --dockerfile='Dockerfile' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ + --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \ --mac-product-key='confluence' \ --tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ diff --git a/pipelines-generator.py b/pipelines-generator.py index 688cbf4..ef9641f 100755 --- a/pipelines-generator.py +++ b/pipelines-generator.py @@ -12,7 +12,7 @@ images = { 'start_version': '7.2', 'end_version': '8', 'default_release': True, - 'base_image': 'adoptopenjdk:11-hotspot', + 'base_image': 'adoptopenjdk/openjdk11', 'tag_suffixes': ['adoptopenjdk11', 'jdk11', 'ubuntu', 'ubuntu-18.04-adoptopenjdk11'], 'dockerfile': 'Dockerfile', 'docker_repos': REPOS,