Merge release/2024-q2 into master

.devcontainer/Dockerfile

@@ -45,7 +45,7 @@ RUN apt-get -y install snmp
 
 #-------------------Install Kafka----------------------------------
 RUN mkdir ~/Downloads
-RUN curl "https://archive.apache.org/dist/kafka/3.6.0/kafka_2.12-3.6.0.tgz" -o ~/Downloads/kafka.tgz
+RUN curl "https://archive.apache.org/dist/kafka/3.6.1/kafka_2.12-3.6.1.tgz" -o ~/Downloads/kafka.tgz
 RUN mkdir ~/kafka \
     && cd ~/kafka \
     && tar -xvzf ~/Downloads/kafka.tgz --strip 1

.devcontainer/kafka

@@ -8,32 +8,20 @@ export LOG_DIR=/var/log/kafka
 case "$1" in
   start)
         # Start daemon.
-        echo "Starting Zookeeper";
-        $DAEMON_PATH/bin/zookeeper-server-start.sh -daemon $DAEMON_PATH/config/zookeeper.properties
         echo "Starting Kafka";
         $DAEMON_PATH/bin/kafka-server-start.sh -daemon $DAEMON_PATH/config/server.properties
         ;;
   stop)
         # Stop daemons.
         echo "Shutting down Kafka";
         $DAEMON_PATH/bin/kafka-server-stop.sh
-        sleep 2
-        echo "Shutting down Zookeeper";
-        $DAEMON_PATH/bin/zookeeper-server-stop.sh
         ;;
   restart)
         $0 stop
         sleep 2
         $0 start
         ;;
   status)
-        pid=`ps ax | grep -i 'org.apache.zookeeper.server' | grep -v grep | awk '{print $1}'`
-        if [ -n "$pid" ]
-          then
-          echo "Zookeeper is Running as PID: $pid"
-        else
-          echo "Zookeeper is not Running"
-        fi
         pid=`ps ax | grep -i 'kafka.Kafka' | grep -v grep | awk '{print $1}'`
         if [ -n "$pid" ]
           then

.devcontainer/post-create.sh

@@ -1,8 +1,10 @@
 cd ~/kafka/
-# start zookeeper
-bin/zookeeper-server-start.sh -daemon config/zookeeper.properties
+KAFKA_CLUSTER_ID="$(bin/kafka-storage.sh random-uuid)"
+
+bin/kafka-storage.sh format -t $KAFKA_CLUSTER_ID -c config/kraft/server.properties
+
 # start kafka
-bin/kafka-server-start.sh -daemon config/server.properties
+bin/kafka-server-start.sh -daemon config/kraft/server.properties
 # wait 2 seconds for the server to start and be able to add partitions
 sleep 2s
 # add topics

.github/workflows/dockerhub.yml

@@ -20,8 +20,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Replcae Docker tag
+        id: set_tag
+        run: echo "TAG=$(echo ${GITHUB_REF##*/} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Build
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: usdotjpoode/jpo-ode:${{ github.ref_name }}
+          tags: usdotjpoode/jpo-ode:${{ env.TAG }}

.gitignore

@@ -21,6 +21,7 @@ settings.xml
 /.settings
 .metadata
 *.pyc
+/kafka/
 
 ####################
 ### jpo-ode-svcs ###