diff --git a/ci/README.adoc b/ci/README.adoc index a35c1488..24641d94 100644 --- a/ci/README.adoc +++ b/ci/README.adoc @@ -46,7 +46,7 @@ The pipeline can be deployed using the following command: [source] ---- -$ fly -t spring-graphql set-pipeline -p spring-graphql-1.0.x -c ci/pipeline.yml -l ci/parameters.yml +$ fly -t spring-graphql set-pipeline -p spring-graphql-1.1.x -c ci/pipeline.yml -l ci/parameters.yml ---- NOTE: This assumes that you have Vault configured with the appropriate secrets. \ No newline at end of file diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 76a53594..01cfa5d1 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:focal-20220531 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh ADD get-docker-url.sh /get-docker-url.sh -RUN ./setup.sh java8 +RUN ./setup.sh java17 ENV JAVA_HOME /opt/openjdk ENV PATH $JAVA_HOME/bin:$PATH diff --git a/ci/images/get-docker-url.sh b/ci/images/get-docker-url.sh index fbc74cad..1f5d1c2d 100755 --- a/ci/images/get-docker-url.sh +++ b/ci/images/get-docker-url.sh @@ -1,5 +1,5 @@ #!/bin/bash set -e -version="20.10.14" +version="20.10.17" 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 c6f64367..faa193b1 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -2,15 +2,12 @@ set -e case "$1" in - java8) - echo "https://github.com/bell-sw/Liberica/releases/download/8u333%2B2/bellsoft-jre8u333+2-linux-amd64.tar.gz" - ;; - java11) - echo "https://github.com/bell-sw/Liberica/releases/download/11.0.15.1+2/bellsoft-jdk11.0.15.1+2-linux-amd64.tar.gz" - ;; java17) echo "https://github.com/bell-sw/Liberica/releases/download/17.0.3.1+2/bellsoft-jdk17.0.3.1+2-linux-amd64.tar.gz" ;; + java18) + echo "https://github.com/bell-sw/Liberica/releases/download/18.0.1.1+2/bellsoft-jdk18.0.1.1+2-linux-amd64.tar.gz" + ;; *) echo $"Unknown java version" exit 1 diff --git a/ci/parameters.yml b/ci/parameters.yml index 4457a6e7..028623f9 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -3,7 +3,7 @@ github-repo-name: "spring-projects/spring-graphql" docker-hub-organization: "springci" artifactory-server: "https://repo.spring.io" branch: "main" -milestone: "1.0.x" +milestone: "1.1.x" build-name: "spring-graphql" pipeline-name: "spring-graphql" concourse-url: "https://ci.spring.io"