Merge pull request #89 from nityatadepalli123/master

add java, mirrormaker, nodejs, python samples to workflow
ibm-messaging · Jan 24, 2024 · cee30fe · cee30fe
2 parents a01a3b8 + be960da
commit cee30fe
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -4,6 +4,11 @@ on:
     branches: ['master']
     paths:
       - 'kafka-java-console-sample/**'
+      - 'kafka-mirrormaker/**'
+      - 'kafka-java-console-schema-sample/**'
+      - 'kafka-nodejs-console-sample/**'
+      - 'kafka-python-console-sample/**'
+
 
 env:
   REGISTRY: ghcr.io
@@ -17,6 +22,15 @@ jobs:
         include:
           - directory: kafka-java-console-sample
             image:     kafka-java-console-sample:latest
+          - directory: kafka-java-console-schema-sample
+            image:     kafka-java-console-schema-sample:latest
+          - directory: kafka-mirrormaker
+            image:     kafka-mirrormaker:latest
+          - directory: kafka-nodejs-console-sample
+            image:     kafka-nodejs-console-sample:latest
+          - directory: kafka-python-console-sample
+            image:     kafka-python-console-sample:latest
+
     permissions:
       contents: read
       packages: write

diff --git a/kafka-connect/Dockerfile b/kafka-connect/Dockerfile
@@ -9,7 +9,7 @@ RUN curl -L "https://downloads.apache.org/kafka/3.4.1/kafka_2.12-3.4.1.tgz" -o k
 RUN mkdir /opt/kafka \
     && tar -xf kafka.tgz -C /opt/kafka --strip-components=1
 
-FROM ibmjava:11
+FROM openjdk:11
 
 RUN addgroup --gid 5000 --system esgroup && \
     adduser --uid 5000 --ingroup esgroup --system esuser

diff --git a/kafka-java-console-schema-sample/Dockerfile b/kafka-java-console-schema-sample/Dockerfile
@@ -1,11 +1,14 @@
-FROM gradle:jdk8-alpine as jdk
+FROM gradle:jdk11-alpine as jdk
 
 COPY --chown=1000 . /usr/src/app
 WORKDIR /usr/src/app
 
+COPY build.gradle settings.gradle /usr/src/app/
+COPY src /usr/src/app/src
+
 RUN gradle -s --no-daemon assemble
 
-FROM ibmjava:8-sfj-alpine
+FROM openjdk:11
 
 COPY --from=jdk /usr/src/app/build/libs/kafka-java-console-schema-sample-2.0.jar /usr/src/app/
 

diff --git a/kafka-java-console-schema-sample/kafka-java-console-schema-sample.yaml b/kafka-java-console-schema-sample/kafka-java-console-schema-sample.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: default
 spec:
   containers:
-  - image: ibmcom/kafka-java-console-schema-sample:latest
+  - image: event-streams-samples/kafka-java-console-schema-sample:latest
     imagePullPolicy: Always
     name: java-sample
     env:

diff --git a/kafka-mirrormaker/Dockerfile b/kafka-mirrormaker/Dockerfile
@@ -7,7 +7,7 @@ RUN curl -L "https://downloads.apache.org/kafka/3.4.1/kafka_2.12-3.4.1.tgz" -o k
 RUN mkdir /opt/kafka \
     && tar -xf kafka.tgz -C /opt/kafka --strip-components=1
 
-FROM ibmjava:11
+FROM openjdk:11 
 
 RUN addgroup --gid 5000 --system esgroup && \
     adduser --uid 5000 --ingroup esgroup --system esuser
@@ -25,4 +25,4 @@ ENV TOPIC_REGEX=.*
 
 USER esuser
 
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["kafka-mirrormaker/entrypoint.sh"]
diff --git a/kafka-mirrormaker/IKS/kafka-mirrormaker.yaml b/kafka-mirrormaker/IKS/kafka-mirrormaker.yaml
@@ -21,7 +21,7 @@ spec:
         runAsUser: 5000
       containers:
         - name: kafkamirrormaker-container
-          image: ibmcom/eventstreams-kafkamirrormaker:latest
+          image: event-streams-samples/kafkamirrormaker:latest
           env:
           - name: TOPIC_REGEX
             value: "mytopic"

diff --git a/kafka-nodejs-console-sample/kafka-nodejs-console-sample.yaml b/kafka-nodejs-console-sample/kafka-nodejs-console-sample.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: default
 spec:
   containers:
-  - image: ibmcom/kafka-nodejs-console-sample:latest
+  - image: event-streams-samples/kafka-nodejs-console-sample:latest
     imagePullPolicy: IfNotPresent
     name: nodejs-sample
     env:

diff --git a/kafka-python-console-sample/kafka-python-console-sample.yaml b/kafka-python-console-sample/kafka-python-console-sample.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: default
 spec:
   containers:
-  - image: ibmcom/kafka-python-console-sample:latest
+  - image: event-streams-samples/kafka-python-console-sample:latest
     imagePullPolicy: IfNotPresent
     name: python-sample
     env: