Skip to content

Commit

Permalink
Updated JDK version
Browse files Browse the repository at this point in the history
  • Loading branch information
vihangpatil committed Nov 4, 2019
1 parent bd0482f commit db5898f
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ jobs:
machine:
image: ubuntu-1604:201903-01
environment:
JAVA_HOME: /usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64
JAVA_HOME: /usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64

steps:
- checkout
- run:
name: upgrading Java to open-jdk-12
command: |
# sudo apt update; sudo apt install -y wget
sudo wget https://cdn.azul.com/zulu/bin/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -O /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz
sudo tar -zxf /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -C /usr/lib/jvm
sudo wget https://cdn.azul.com/zulu/bin/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -O /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz
sudo tar -zxf /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -C /usr/lib/jvm
- run:
# checking for merge conflicts and merging locally if none exist
name: merging ${CIRCLE_BRANCH} into develop locally
Expand All @@ -29,7 +29,7 @@ jobs:
- run:
name: javac -version
command: |
export PATH=/usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64/bin:$PATH
export PATH=/usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64/bin:$PATH
javac -version
- run:
name: Pulling Gradle cache
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
CODACY_MODULE: com.codacy.CodacyCoverageReporter

docker:
- image: circleci/openjdk:11.0.3-jdk-stretch
- image: circleci/openjdk:13.0.1-jdk-buster

steps:
- run:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
machine:
image: ubuntu-1604:201903-01
environment:
JAVA_HOME: /usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64
JAVA_HOME: /usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64

steps:
- checkout
Expand All @@ -126,8 +126,8 @@ jobs:
command: |
# sudo apt update; sudo apt install -y wget
sudo wget https://cdn.azul.com/zulu/bin/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -O /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz
sudo tar -zxf /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -C /usr/lib/jvm
sudo wget https://cdn.azul.com/zulu/bin/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -O /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz
sudo tar -zxf /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -C /usr/lib/jvm
- run:
name: Pulling Gradle cache
command: |
Expand All @@ -142,7 +142,7 @@ jobs:
- run:
name: javac -version
command: |
export PATH=/usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64/bin:$PATH
export PATH=/usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64/bin:$PATH
javac -version
- run:
name: Gradle Build Prime and ScanInfo Shredder
Expand Down
2 changes: 1 addition & 1 deletion acceptance-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion auth-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion ext-auth-provider/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion ext-myinfo-emulator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion ocsgw/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion prime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion prime/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is used when running locally using docker-compose for Acceptance Testing.

FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion prime/cloudbuild.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ steps:
path: /root/out_zip
# Build docker images
- name: gcr.io/cloud-builders/docker
args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$SHORT_SHA', '--cache-from', 'azul/zulu-openjdk:13', 'prime']
args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$SHORT_SHA', '--cache-from', 'azul/zulu-openjdk:13.0.1', 'prime']
timeout: 120s
# Deploy new docker image to Google Kubernetes Engine (GKE)
- name: ubuntu
Expand Down
2 changes: 1 addition & 1 deletion prime/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ steps:
path: /root/out_zip
# Build docker images
- name: gcr.io/cloud-builders/docker
args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$TAG_NAME', '--cache-from', 'azul/zulu-openjdk:13', 'prime']
args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$TAG_NAME', '--cache-from', 'azul/zulu-openjdk:13.0.1', 'prime']
timeout: 120s
# Deploy new docker image to Google Kubernetes Engine (GKE)
- name: ubuntu
Expand Down
2 changes: 1 addition & 1 deletion scaninfo-shredder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion scaninfo-shredder/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion sim-administration/sm-dp-plus-emulator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:13
FROM azul/zulu-openjdk:13.0.1

LABEL maintainer="[email protected]"

Expand Down

0 comments on commit db5898f

Please sign in to comment.