CF-4251:docker image for postgreSQL array fix

Author: ksrihari09

.github/workflows/Docker.build.yaml

@@ -0,0 +1,51 @@
+name: Docker Build and Deploy
+
+on:
+  push:
+    branches:
+      - fix/postgresql-array-handling    #branch name which is used for image building
+
+jobs:
+  build:
+    runs-on: self-hosted
+    permissions:
+      contents: read
+      packages: read
+
+    env:
+      ECR_REPOSITORY: atomhopper
+      AWS_REGION: us-east-1
+
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - name: Set Short commit SHA as image tag
+        run: echo "IMAGE_TAG=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
+
+      - name: GitHub Packages login
+        run: |
+          echo "Logging into GitHub Container Registry..."
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+          echo "Logging into GitHub Packages Maven registry..."
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login maven.pkg.github.com -u ${{ github.actor }} --password-stdin
+
+      - name: AWS ECR login
+        run: |
+          aws ecr get-login-password --region ${{ env.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com
+      - name: Build docker image
+        run: |
+          cd docker
+          echo "Building Docker image with GitHub authentication..."
+          docker build \
+            --build-arg GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
+            --build-arg GITHUB_ACTOR=${{ github.actor }} \
+            --progress=plain \
+            -t atomhopper:latest-alpine .
+          echo "Tagging images for ECR..."
+          docker tag atomhopper:latest-alpine ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
+          docker tag atomhopper:latest-alpine ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:latest
+      - name: Push docker image to registry
+        run: |
+          docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
+          docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:latest

docker/Dockerfile

@@ -3,9 +3,19 @@ FROM tomcat:9.0.41-jdk8 as tomcat
 
 FROM adoptopenjdk/openjdk8:alpine-slim
 
+# Build arguments for GitHub authentication
+ARG GITHUB_TOKEN
+ARG GITHUB_ACTOR
+
+# Validate that authentication arguments are provided
+RUN if [ -z "$GITHUB_TOKEN" ] || [ -z "$GITHUB_ACTOR" ]; then \
+        echo "ERROR: GITHUB_TOKEN and GITHUB_ACTOR build arguments are required for GitHub Packages authentication"; \
+        exit 1; \
+    fi
+
 LABEL maintainer="AtomHopperTeam@rackspace.com" \
       #Atom Hopper version
-      version="1.2.33" \
+      version="1.2.35" \
       description="Docker image for Atom Hopper"
 
     #The database type
@@ -16,7 +26,7 @@ ENV DB_TYPE=H2 \
     DB_PASSWORD= \
     #Database Host:Port
     DB_HOST=h2 \
-    AH_VERSION=1.2.33 \
+    AH_VERSION=1.2.35 \
     CATALINA_HOME=/opt/tomcat \
     AH_HOME=/opt/atomhopper  \
     PATH=${PATH}:${CATALINA_HOME}/bin:${AH_HOME}
@@ -28,14 +38,18 @@ WORKDIR ${AH_HOME}
 COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME}
 COPY start.sh .
 
-RUN apk --no-cache add curl \
-    && curl -o atomhopper.war https://maven.research.rackspacecloud.com/content/repositories/releases/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war \
+RUN apk --no-cache add curl unzip \
+    && echo "Downloading AtomHopper ${AH_VERSION} from GitHub Packages..." \
+    && curl -f -u ${GITHUB_ACTOR}:${GITHUB_TOKEN} -o atomhopper.war \
+       "https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \
+    && echo "Download completed, extracting configuration files..." \
     && unzip atomhopper.war META-INF/application-context.xml META-INF/template-logback.xml WEB-INF/classes/META-INF/atom-server.cfg.xml -d . \
     && mv META-INF/application-context.xml WEB-INF/classes/META-INF/atom-server.cfg.xml /etc/atomhopper/ \
     && mv META-INF/template-logback.xml /etc/atomhopper/logback.xml \
     && mv atomhopper.war ${CATALINA_HOME}/webapps/ROOT.war \
     && rm -rf META-INF WEB-INF \
-    && chmod +x ${AH_HOME}/start.sh 
+    && chmod +x ${AH_HOME}/start.sh \
+    && echo "AtomHopper ${AH_VERSION} setup completed successfully" 
 
 EXPOSE 8080
 

docker/README.md

@@ -1,10 +1,36 @@
-# docker build image and run the conatiner
-Your current direcotry should be pointing to ***atom-hopper/docker***. 
-Run the following command to build an image.
-```
-$docker build -t atomhopper:latest-alpine .
+# docker build image and run the container
+
+## Building the Docker Image
+
+Your current directory should be pointing to ***atom-hopper/docker***. 
+
+### Prerequisites
+The Docker build now downloads AtomHopper from GitHub Packages, which requires authentication. You need:
+- A GitHub Personal Access Token with `packages:read` permission
+- Your GitHub username
+
+### Build Command
+Run the following command to build an image with GitHub authentication:
+```bash
+docker build \
+  --build-arg GITHUB_TOKEN=your_github_token \
+  --build-arg GITHUB_ACTOR=your_github_username \
+  -t atomhopper:latest-alpine .
 ```
-You can use the following command to run a container by provinding the appropriate values to the variables.
+
+### Alternative: Using Environment Variables
+You can also set environment variables and build:
+```bash
+export GITHUB_TOKEN=your_github_token
+export GITHUB_ACTOR=your_github_username
+docker build \
+  --build-arg GITHUB_TOKEN=$GITHUB_TOKEN \
+  --build-arg GITHUB_ACTOR=$GITHUB_ACTOR \
+  -t atomhopper:latest-alpine .
+```
+## Running the Container
+
+You can use the following command to run a container by providing the appropriate values to the variables.
 ```
 $docker run -d --name [Conatiner_Name] -p 8080:8080 -e DB_TYPE=[Database_Type (PostgreSQL, MySQL)] -e DB_USER=[Database_Username] -e DB_PASSWORD=[Database_Password] -e DB_HOST=[IP:PORT] atomhopper:latest-alpine
 ```
@@ -22,7 +48,7 @@ Following environment variables are set by default
 JAVA_HOME "/opt/java/openjdk8/jre"
 CATALINA_HOME "/opt/tomcat"
 AH_HOME "/opt/atomhopper"
-AH_VERSION "1.2.33" 
+AH_VERSION "1.2.35" 
 ```
 For specific databse configuration of your choice (PostgreSQL,MySQL) provide values for the variables DB_TYPE, DB_USER, DB_PASSWORD and DB_HOST