Release 2.2.0

ozone-his · Jun 7, 2024 · 148ef52 · 148ef52
1 parent 76e4fcb
commit 148ef52
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>