From 22f142c54505d8204257da2d7bd08528b4834a29 Mon Sep 17 00:00:00 2001
From: MaxRossGoogle <maxr@google.com>
Date: Wed, 16 Sep 2020 22:40:33 -0700
Subject: [PATCH 1/4] Create missing Dockerfile

---
 run/events-storage/Dockerfile | 41 +++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 run/events-storage/Dockerfile

diff --git a/run/events-storage/Dockerfile b/run/events-storage/Dockerfile
new file mode 100644
index 00000000000..5e61fc3050b
--- /dev/null
+++ b/run/events-storage/Dockerfile
@@ -0,0 +1,41 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START run_events_storage_dockerfile]
+
+# Use the official maven/Java 8 image to create a build artifact.
+# https://hub.docker.com/_/maven
+FROM maven:3.6-jdk-11 as builder
+
+# Copy local code to the container image.
+WORKDIR /app
+COPY pom.xml .
+COPY src ./src
+
+# Build a release artifact.
+RUN mvn package -DskipTests
+
+# Use AdoptOpenJDK for base image.
+# It's important to use OpenJDK 8u191 or above that has container support enabled.
+# https://hub.docker.com/r/adoptopenjdk/openjdk8
+# https://docs.docker.com/develop/develop-images/multistage-build/#use-multi-stage-builds
+FROM adoptopenjdk/openjdk11:alpine-slim
+
+# Copy the jar to the production image from the builder stage.
+COPY --from=builder /app/target/events-storage-*.jar /events-storage.jar
+
+# Run the web service on container startup.
+CMD ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/events-storage.jar"]
+
+# [END run_events_storage_dockerfile]

From df23bae576f4512ac546e6dbb7400b653424bddc Mon Sep 17 00:00:00 2001
From: MaxRossGoogle <maxr@google.com>
Date: Wed, 16 Sep 2020 22:41:55 -0700
Subject: [PATCH 2/4] Fix pom.xml

Need to support successful gcloud builds submit command on this sample.
---
 run/events-storage/pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/run/events-storage/pom.xml b/run/events-storage/pom.xml
index 4507b987cfb..b74e6b3f72b 100644
--- a/run/events-storage/pom.xml
+++ b/run/events-storage/pom.xml
@@ -77,6 +77,13 @@ limitations under the License.
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <!-- [START run_events_gcs_jib] -->
       <plugin>
@@ -85,7 +92,7 @@ limitations under the License.
         <version>2.5.2</version>
         <configuration>
           <to>
-            <image>gcr.io/PROJECT_ID/gcs-container</image>
+            <image>gcr.io/PROJECT_ID/events-storage</image>
           </to>
         </configuration>
       </plugin>

From ae92ba55a283121dd770c802408b23e2dd2b926e Mon Sep 17 00:00:00 2001
From: Averi Kitsch <akitsch@google.com>
Date: Thu, 17 Sep 2020 08:57:05 -0700
Subject: [PATCH 3/4] Update region tag

---
 run/events-storage/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run/events-storage/Dockerfile b/run/events-storage/Dockerfile
index 5e61fc3050b..512162fd071 100644
--- a/run/events-storage/Dockerfile
+++ b/run/events-storage/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START run_events_storage_dockerfile]
+# [START run_events_gcs_dockerfile]
 
 # Use the official maven/Java 8 image to create a build artifact.
 # https://hub.docker.com/_/maven
@@ -38,4 +38,4 @@ COPY --from=builder /app/target/events-storage-*.jar /events-storage.jar
 # Run the web service on container startup.
 CMD ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/events-storage.jar"]
 
-# [END run_events_storage_dockerfile]
+# [END run_events_gcs_dockerfile]

From 06596afe993d29b6fc12ad81cde3939c67cb3b02 Mon Sep 17 00:00:00 2001
From: Averi Kitsch <akitsch@google.com>
Date: Thu, 17 Sep 2020 08:58:22 -0700
Subject: [PATCH 4/4] Keep container name consistent across languages

---
 run/events-storage/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/events-storage/pom.xml b/run/events-storage/pom.xml
index b74e6b3f72b..e07803b1dbd 100644
--- a/run/events-storage/pom.xml
+++ b/run/events-storage/pom.xml
@@ -92,7 +92,7 @@ limitations under the License.
         <version>2.5.2</version>
         <configuration>
           <to>
-            <image>gcr.io/PROJECT_ID/events-storage</image>
+            <image>gcr.io/PROJECT_ID/gcs-container</image>
           </to>
         </configuration>
       </plugin>