CF-4251:docker image for postgreSQL array fix

Author: ksrihari09

docker/Dockerfile

@@ -3,19 +3,9 @@ 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.35" \
+      version="1.2.33" \
       description="Docker image for Atom Hopper"
 
     #The database type
@@ -26,46 +16,27 @@ ENV DB_TYPE=H2 \
     DB_PASSWORD= \
     #Database Host:Port
     DB_HOST=h2 \
-    AH_VERSION=1.2.35 \
+    AH_VERSION=1.2.33 \
     CATALINA_HOME=/opt/tomcat \
     AH_HOME=/opt/atomhopper  \
     PATH=${PATH}:${CATALINA_HOME}/bin:${AH_HOME}
 
-RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/ 
+RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/
 
 WORKDIR ${AH_HOME}
 
 COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME}
-COPY docker/start.sh .
+COPY start.sh .
 
-RUN apk --no-cache add curl unzip file \
-    && echo "Downloading AtomHopper ${AH_VERSION} from GitHub Packages..." \
-    && echo "URL: https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \
-    && curl -v -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. File info:" \
-    && ls -la atomhopper.war \
-    && file atomhopper.war \
-    && echo "First 200 bytes of downloaded file:" \
-    && head -c 200 atomhopper.war \
-    && echo "" \
-    && echo "Checking if file is a valid ZIP/WAR..." \
-    && if ! unzip -t atomhopper.war > /dev/null 2>&1; then \
-        echo "ERROR: Downloaded file is not a valid WAR/ZIP file"; \
-        echo "Content of downloaded file:"; \
-        cat atomhopper.war; \
-        exit 1; \
-    fi \
-    && echo "Extracting configuration files..." \
+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 \
     && 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 \
-    && echo "AtomHopper ${AH_VERSION} setup completed successfully" 
+    && chmod +x ${AH_HOME}/start.sh
 
 EXPOSE 8080
 
 CMD ["start.sh"]
-

docker/README.md

@@ -1,36 +1,10 @@
-# 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 .
+# 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.
 ```
-
-### 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 build -t atomhopper:latest-alpine .
+```
+You can use the following command to run a container by provinding 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
 ```
@@ -43,19 +17,16 @@ Test the sample feed at http://localhost:8080/namespace/feed
 
 H2 is the default databse configured to be used. The databse file for this is present under */opt/atomhopper*
 
-Following environment variables are set by default 
+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.35" 
+AH_VERSION "1.2.33" 
 ```
 For specific databse configuration of your choice (PostgreSQL,MySQL) provide values for the variables DB_TYPE, DB_USER, DB_PASSWORD and DB_HOST
 
-Example of running with a PostgreSQL databse hosted externally. 
+Example of running with a PostgreSQL databse hosted externally.
 ```
 $docker run -d --name atomhopper -p 8080:8080 -e DB_TYPE=PostgreSQL -e DB_USER=postgresql -e DB_PASSWORD=postgresql -e DB_HOST=10.0.0.1:5432 atomhopper:latest-alpine
-```
-
-
-
+```