Merge branch 'aws/arm' into 'master'

AWS: Building multi-arch Alpine images

See merge request !973

provider/storage-aws/build-aws/Dockerfile

@@ -13,17 +13,19 @@
 # limitations under the License.
 
 # https://docs.spring.io/spring-boot/docs/current/reference/html/deployment.html
-FROM public.ecr.aws/amazoncorretto/amazoncorretto:17
+FROM registry.repo.osdu.aws/amazoncorretto:17-alpine
 
-RUN yum update -y && yum install -y shadow-utils
-
-RUN groupadd -g 10001 -r appgroup \
-  && useradd -M -g 10001 -r -u 10001 appuser
+RUN apk update && \
+    apk add --no-cache \
+    bash \
+    curl \
+    shadow \
+    && \
+    /usr/sbin/groupadd -g 10001 -r appgroup && \
+    /usr/sbin/useradd -M -g 10001 -r -u 10001 appuser
 
 ARG JAR_FILE=provider/storage-aws/target/*spring-boot.jar
 
-
-
 WORKDIR /
 COPY ${JAR_FILE} app.jar
 COPY /provider/storage-aws/build-aws/entrypoint.sh /entrypoint.sh

provider/storage-aws/build-aws/buildspec.yaml

@@ -82,12 +82,10 @@ phases:
       - echo "--Copying Helm Charts to ${OUTPUT_DIR:-dist}--"
       - rsync -r devops/aws/* "${OUTPUT_DIR:-dist}"
 
-      - echo "Building docker image..."
-      - docker build -f provider/storage-aws/build-aws/Dockerfile -t ${ECR_IMAGE} .
-      - docker tag  ${ECR_IMAGE} ${ECR_IMAGE_BRANCH_LATEST}
-      - echo "Pushing docker image..."
-      - docker push ${ECR_IMAGE}
-      - docker push ${ECR_IMAGE_BRANCH_LATEST}
+      - echo "Build and push docker image..."
+      - docker buildx create --driver docker-container --use
+      - docker buildx inspect --bootstrap
+      - docker buildx build --platform linux/arm64/v8,linux/amd64 --pull --push -f provider/storage-aws/build-aws/Dockerfile -t ${ECR_IMAGE} -t ${ECR_IMAGE_BRANCH_LATEST} .
 
       - echo "Generate build-info.json"
       - |