clickstream demo CI images

confluentinc · Oct 30, 2017 · d16bef3 · d16bef3
1 parent 3ac6348
commit d16bef3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,5 +5,5 @@ docker_oraclejdk8 {
     withPush = true
     upstreamProjects = 'confluentinc/schema-registry'
     dockerRegistry = '368821881613.dkr.ecr.us-west-2.amazonaws.com/'
-    dockerRepos = ['confluentinc/ksql-examples', 'confluentinc/ksql-cli']
+    dockerRepos = ['confluentinc/ksql-examples', 'confluentinc/ksql-cli', 'confluentinc/ksql-clickstream-demo']
 }
diff --git a/ksql-clickstream-demo/Dockerfile b/ksql-clickstream-demo/Dockerfile
@@ -1,8 +1,8 @@
 # https://confluentinc.atlassian.net/browse/KSQL-292
 
-ARG DOCKER_REGISTRY
+ARG DOCKER_UPSTREAM_REGISTRY
 
-FROM ${DOCKER_REGISTRY}confluentinc/docker-demo-base:3.3.0
+FROM ${DOCKER_UPSTREAM_REGISTRY}confluentinc/docker-demo-base:3.3.0
 
 ARG KSQL_VERSION
 ARG ARTIFACT_ID

diff --git a/ksql-clickstream-demo/pom.xml b/ksql-clickstream-demo/pom.xml
@@ -42,6 +42,12 @@
             <artifactId>ksql-cli</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -91,10 +97,12 @@
                                     <goal>build</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${docker.skip}</skip>
                                     <buildArgs>
                                         <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
                                         <KSQL_VERSION>${project.version}</KSQL_VERSION>
                                         <DOCKER_REGISTRY>${docker.registry}</DOCKER_REGISTRY>
+                                        <DOCKER_UPSTREAM_REGISTRY>docker.io/</DOCKER_UPSTREAM_REGISTRY>
                                     </buildArgs>
                                     <tag>${docker.tag}</tag>
                                     <repository>${docker.registry}confluentinc/${project.artifactId}</repository>

diff --git a/pom.xml b/pom.xml
@@ -23,6 +23,7 @@
         <module>ksql-cli</module>
         <module>ksql-examples</module>
         <module>ksql-rest-app</module>
+        <module>ksql-clickstream-demo</module>
     </modules>
 
     <repositories>