diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 490188fc..a278aef5 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230816 +FROM ubuntu:jammy-20231004 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/get-docker-url.sh b/ci/images/get-docker-url.sh index dcf7c6a4..0a3e5d17 100755 --- a/ci/images/get-docker-url.sh +++ b/ci/images/get-docker-url.sh @@ -1,5 +1,5 @@ #!/bin/bash set -e -version="24.0.4" +version="24.0.7" echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz"; \ No newline at end of file diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 65d15c4d..aca288d8 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,11 +3,10 @@ set -e case "$1" in java17) - echo "https://download.bell-sw.com/java/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz" - ;; + echo "https://github.com/bell-sw/Liberica/releases/download/17.0.9+11/bellsoft-jdk17.0.9+11-linux-amd64.tar.gz" java21) - echo "https://download.java.net/java/early_access/jdk21/25/GPL/openjdk-21-ea+25_linux-x64_bin.tar.gz" - ;; + echo "https://github.com/bell-sw/Liberica/releases/download/21.0.1+12/bellsoft-jdk21.0.1+12-linux-amd64.tar.gz" + ;; *) echo $"Unknown java version" exit 1 diff --git a/ci/pipeline.yml b/ci/pipeline.yml index be222b50..0235087a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -25,7 +25,7 @@ resource_types: source: <<: *registry-image-resource-source repository: concourse/registry-image-resource - tag: 1.7.1 + tag: 1.9.0 - name: artifactory-resource type: registry-image source: @@ -37,7 +37,7 @@ resource_types: source: <<: *registry-image-resource-source repository: concourse/github-release-resource - tag: 1.8.0 + tag: 1.9.0 resources: - name: git-repo diff --git a/ci/tasks/promote-version.yml b/ci/tasks/promote-version.yml index 683482f8..129de384 100644 --- a/ci/tasks/promote-version.yml +++ b/ci/tasks/promote-version.yml @@ -4,7 +4,7 @@ image_resource: type: registry-image source: repository: springio/concourse-release-scripts - tag: '0.3.4' + tag: '0.4.0' username: ((docker-hub-username)) password: ((docker-hub-password)) inputs: