From 148ef5299bb794e46504ab72daa02cf8ae8f4458 Mon Sep 17 00:00:00 2001
From: kdaud <dkakumirizii@gmail.com>
Date: Thu, 6 Jun 2024 16:43:37 +0300
Subject: [PATCH] Release 2.2.0

---
 .github/workflows/build-publish.yml         | 4 +++-
 docker/docker-compose-batch-etl.yaml        | 2 +-
 docker/docker-compose-export.yaml           | 2 +-
 docker/docker-compose-streaming-common.yaml | 2 +-
 docker/drill/Dockerfile                     | 2 +-
 docker/minio-webhook/Dockerfile             | 2 +-
 docker/setup-connect/Dockerfile             | 2 +-
 pom.xml                                     | 4 ++--
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
index 33ab9ba..cf53efd 100644
--- a/.github/workflows/build-publish.yml
+++ b/.github/workflows/build-publish.yml
@@ -4,6 +4,8 @@ on:
   push:
   pull_request:
     types: [opened, reopened]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -39,7 +41,7 @@ jobs:
 
   publish:
     runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/main' }}
+    if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
     steps:
       - uses: actions/checkout@v2
 
diff --git a/docker/docker-compose-batch-etl.yaml b/docker/docker-compose-batch-etl.yaml
index 8844878..9c6adf1 100644
--- a/docker/docker-compose-batch-etl.yaml
+++ b/docker/docker-compose-batch-etl.yaml
@@ -3,7 +3,7 @@ services:
   batch-etl:
     networks:
       ozone-analytics:
-    image: mekomsolutions/ozone-flink-jobs-batch
+    image: mekomsolutions/ozone-flink-jobs-batch:2.2.0
     depends_on:
       analytics-migration:
         condition: service_completed_successfully
diff --git a/docker/docker-compose-export.yaml b/docker/docker-compose-export.yaml
index 9efe1fe..ea9a99c 100644
--- a/docker/docker-compose-export.yaml
+++ b/docker/docker-compose-export.yaml
@@ -3,7 +3,7 @@ services:
   parquet-export:
     networks:
       ozone-analytics:
-    image: mekomsolutions/ozone-flink-parquet-export
+    image: mekomsolutions/ozone-flink-parquet-export:2.2.0
     environment:
       - ANALYTICS_DB_USER=${ANALYTICS_DB_USER}
       - ANALYTICS_DB_PASSWORD=${ANALYTICS_DB_PASSWORD}
diff --git a/docker/docker-compose-streaming-common.yaml b/docker/docker-compose-streaming-common.yaml
index 98422fe..2e86fb6 100644
--- a/docker/docker-compose-streaming-common.yaml
+++ b/docker/docker-compose-streaming-common.yaml
@@ -114,7 +114,7 @@ services:
     networks:
       ozone-analytics:
     restart: on-failure
-    image: mekomsolutions/ozone-flink-jobs
+    image: mekomsolutions/ozone-flink-jobs:2.2.0
     ports:
       - "8084:8081"
       - "9250:9250"
diff --git a/docker/drill/Dockerfile b/docker/drill/Dockerfile
index 80d81f0..9cada74 100644
--- a/docker/drill/Dockerfile
+++ b/docker/drill/Dockerfile
@@ -1,4 +1,4 @@
-FROM apache/drill
+FROM apache/drill:1.21.1
 
 USER root
 
diff --git a/docker/minio-webhook/Dockerfile b/docker/minio-webhook/Dockerfile
index d245dfd..b798ee0 100644
--- a/docker/minio-webhook/Dockerfile
+++ b/docker/minio-webhook/Dockerfile
@@ -1,6 +1,6 @@
 
   
-FROM node:latest
+FROM node:lts-alpine
 
 WORKDIR /usr/src/app
 COPY package*.json ./
diff --git a/docker/setup-connect/Dockerfile b/docker/setup-connect/Dockerfile
index 434012e..634f910 100644
--- a/docker/setup-connect/Dockerfile
+++ b/docker/setup-connect/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3
 # Set non-built-time labels
 LABEL org.opencontainers.image.authors="Mekom Solutions"
 LABEL org.opencontainers.image.description="A custom image used to configure kafka connect for flink"
diff --git a/pom.xml b/pom.xml
index 7b85759..4a7a582 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.ozonehis</groupId>
   <artifactId>ozone-analytics</artifactId>
   <name>Ozone Analytics</name>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.2.0</version>
   <packaging>pom</packaging>
   <organization>
     <name>Ozone HIS</name>
@@ -101,7 +101,7 @@
     <repository>
       <name>Mekom Solutions Nexus repo</name>
       <id>mks-nexus-private</id>
-      <url>https://nexus.mekomsolutions.net/repository/maven-private/</url>
+      <url>https://nexus.mekomsolutions.net/repository/maven-private-releases/</url>
     </repository>
     <snapshotRepository>
       <name>Mekom Solutions Nexus repo for snapshots</name>