From 69a19e684ed6bff1cbfcdbebd2f885bb5cd038c8 Mon Sep 17 00:00:00 2001
From: Long Cheng <lchas@amazon.com>
Date: Tue, 22 Aug 2023 00:16:37 -0400
Subject: [PATCH] additional jdk17 updates for aws
---
provider/storage-aws/build-aws/buildspec.yaml | 9 ++++-----
provider/storage-aws/build-aws/entrypoint.sh | 2 +-
provider/storage-aws/pom.xml | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/provider/storage-aws/build-aws/buildspec.yaml b/provider/storage-aws/build-aws/buildspec.yaml
index 50f747611..a94e63b00 100644
--- a/provider/storage-aws/build-aws/buildspec.yaml
+++ b/provider/storage-aws/build-aws/buildspec.yaml
@@ -54,7 +54,9 @@ phases:
pre_build:
commands:
- echo "Logging in to Amazon ECR..."
- - $(aws ecr get-login --no-include-email --region $AWS_REGION) # authenticate with ECR via the AWS CLI
+ - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${ECR_REGISTRY}
+ - echo "Logging into Docker Hub..."
+ - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
build:
commands:
- export REPO_NAME=${PWD##*/}
@@ -85,9 +87,6 @@ phases:
- echo "--Copying Helm Charts to ${OUTPUT_DIR:-dist}--"
- rsync -r devops/aws/* "${OUTPUT_DIR:-dist}"
- - echo "Logging into Docker Hub..."
- - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
-
- echo "Building docker image..."
- docker build -f provider/storage-aws/build-aws/Dockerfile -t ${ECR_IMAGE} .
- docker tag ${ECR_IMAGE} ${ECR_IMAGE_BRANCH_LATEST}
@@ -102,7 +101,7 @@ phases:
--artifact ${ECR_IMAGE}
post_build:
commands:
- - cp provider/storage-aws/target/dependency-check-report.html ${OUTPUT_DIR}
+ - # cp provider/storage-aws/target/dependency-check-report.html ${OUTPUT_DIR}
reports:
SurefireReports: # CodeBuild will create a report group called "SurefireReports".
files: #Store all of the files
diff --git a/provider/storage-aws/build-aws/entrypoint.sh b/provider/storage-aws/build-aws/entrypoint.sh
index 6b4b3b53f..51ad952cf 100755
--- a/provider/storage-aws/build-aws/entrypoint.sh
+++ b/provider/storage-aws/build-aws/entrypoint.sh
@@ -1 +1 @@
-java $JAVA_OPTS -jar /app.jar
\ No newline at end of file
+java $JAVA_OPTS --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED -jar /app.jar
\ No newline at end of file
diff --git a/provider/storage-aws/pom.xml b/provider/storage-aws/pom.xml
index 0ce9e670a..9cafe4da1 100644
--- a/provider/storage-aws/pom.xml
+++ b/provider/storage-aws/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.21.0-rc5</version>
+ <version>0.23.0-rc2</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
--
GitLab