Merge pull request #4 from aws-samples/dev

flo-mair · web-flow · commit 96ede1eac941 · 2021-07-24T17:23:04.000+02:00
Moving from Docker Hub to Amazon ECR
diff --git a/consumer/Dockerfile b/consumer/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazonlinux:2
+FROM public.ecr.aws/amazonlinux/amazonlinux:2
 
 RUN yum install -y java-1.8.0-openjdk.x86_64 &&\
     yum install -y python3.x86_64 &&\
diff --git a/kinesisautoscaler/Dockerfile b/kinesisautoscaler/Dockerfile
@@ -2,7 +2,7 @@
 # Build stage
 #
 
-FROM maven:3.6.0-jdk-11-slim AS build
+FROM public.ecr.aws/hotmart/pipeline-maven:3-jdk-11-slim AS build
 WORKDIR /usr/local/kinesis_scaling
 RUN apt-get update        
 RUN apt-get install -y git
@@ -13,6 +13,6 @@ RUN mvn clean package assembly:assembly
 #
 # Package stage
 #
-FROM openjdk:11-jre-slim
+FROM public.ecr.aws/rogii/openjdk:11-corretto
 COPY --from=build /usr/local/kinesis_scaling/target/KinesisScalingUtils-.9.6.0-complete.jar /usr/local/lib/KinesisScalingUtils-.9.6.0-complete.jar
 ENTRYPOINT java -Dconfig-file-url=${CONFIG_FILE} -cp /usr/local/lib/KinesisScalingUtils-.9.6.0-complete.jar com.amazonaws.services.kinesis.scaling.auto.AutoscalingController
diff --git a/producer/Dockerfile b/producer/Dockerfile
@@ -1,15 +1,15 @@
 #
 # Build stage
 #
-FROM maven:3.6.0-jdk-11-slim AS build
+FROM public.ecr.aws/hotmart/pipeline-maven:3-jdk-11-slim AS build
 COPY src /home/app/src
 COPY pom.xml /home/app
 RUN mvn -f /home/app/pom.xml clean package
 
 #
 # Package stage
 #
-FROM openjdk:11-jre-slim
+FROM public.ecr.aws/rogii/openjdk:11-corretto
 COPY --from=build /home/app/target/producer-0.0.1-SNAPSHOT.jar /usr/local/lib/dataprocessor-producer.jar
 EXPOSE 8080
 ENTRYPOINT ["java","-jar","/usr/local/lib/dataprocessor-producer.jar"]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM amazonlinux:2`
	`1`	`+FROM public.ecr.aws/amazonlinux/amazonlinux:2`
`2`	`2`
`3`	`3`	`RUN yum install -y java-1.8.0-openjdk.x86_64 &&\`
`4`	`4`	`yum install -y python3.x86_64 &&\`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Build stage`
`3`	`3`	`#`
`4`	`4`
`5`		`-FROM maven:3.6.0-jdk-11-slim AS build`
	`5`	`+FROM public.ecr.aws/hotmart/pipeline-maven:3-jdk-11-slim AS build`
`6`	`6`	`WORKDIR /usr/local/kinesis_scaling`
`7`	`7`	`RUN apt-get update`
`8`	`8`	`RUN apt-get install -y git`
`@@ -13,6 +13,6 @@ RUN mvn clean package assembly:assembly`
`13`	`13`	`#`
`14`	`14`	`# Package stage`
`15`	`15`	`#`
`16`		`-FROM openjdk:11-jre-slim`
	`16`	`+FROM public.ecr.aws/rogii/openjdk:11-corretto`
`17`	`17`	`COPY --from=build /usr/local/kinesis_scaling/target/KinesisScalingUtils-.9.6.0-complete.jar /usr/local/lib/KinesisScalingUtils-.9.6.0-complete.jar`
`18`	`18`	`ENTRYPOINT java -Dconfig-file-url=${CONFIG_FILE} -cp /usr/local/lib/KinesisScalingUtils-.9.6.0-complete.jar com.amazonaws.services.kinesis.scaling.auto.AutoscalingController`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`#`
`2`	`2`	`# Build stage`
`3`	`3`	`#`
`4`		`-FROM maven:3.6.0-jdk-11-slim AS build`
	`4`	`+FROM public.ecr.aws/hotmart/pipeline-maven:3-jdk-11-slim AS build`
`5`	`5`	`COPY src /home/app/src`
`6`	`6`	`COPY pom.xml /home/app`
`7`	`7`	`RUN mvn -f /home/app/pom.xml clean package`
`8`	`8`
`9`	`9`	`#`
`10`	`10`	`# Package stage`
`11`	`11`	`#`
`12`		`-FROM openjdk:11-jre-slim`
	`12`	`+FROM public.ecr.aws/rogii/openjdk:11-corretto`
`13`	`13`	`COPY --from=build /home/app/target/producer-0.0.1-SNAPSHOT.jar /usr/local/lib/dataprocessor-producer.jar`
`14`	`14`	`EXPOSE 8080`
`15`	`15`	`ENTRYPOINT ["java","-jar","/usr/local/lib/dataprocessor-producer.jar"]`