Skip to content

Commit 98fbf28

Browse files
committed
fixes for PostgreSQL error and spring initialization in Staging
1 parent bf94032 commit 98fbf28

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

docker/Dockerfile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ FROM tomcat:9.0.41-jdk8 as tomcat
33

44
FROM adoptopenjdk/openjdk8:alpine-slim
55

6-
# Build arguments for GitHub authentication
7-
ARG GITHUB_TOKEN
8-
ARG GITHUB_ACTOR
9-
10-
# Validate that authentication arguments are provided
11-
RUN if [ -z "$GITHUB_TOKEN" ] || [ -z "$GITHUB_ACTOR" ]; then \
12-
echo "ERROR: GITHUB_TOKEN and GITHUB_ACTOR build arguments are required for GitHub Packages authentication"; \
13-
exit 1; \
14-
fi
15-
166
LABEL maintainer="AtomHopperTeam@rackspace.com" \
177
#Atom Hopper version
188
version="1.2.33" \
@@ -31,22 +21,21 @@ ENV DB_TYPE=H2 \
3121
AH_HOME=/opt/atomhopper \
3222
PATH=${PATH}:${CATALINA_HOME}/bin:${AH_HOME}
3323

34-
RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/
24+
RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhopper/
3525

3626
WORKDIR ${AH_HOME}
3727

3828
COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME}
3929
COPY docker/start.sh .
4030

41-
RUN apk --no-cache add curl unzip \
42-
&& curl -L -u ${GITHUB_ACTOR}:${GITHUB_TOKEN} -o atomhopper.war \
43-
"https://maven.pkg.github.com/rackerlabs/atom-hopper/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war" \
31+
RUN apk --no-cache add curl \
32+
&& curl -o atomhopper.war https://maven.research.rackspacecloud.com/content/repositories/releases/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war \
4433
&& unzip atomhopper.war META-INF/application-context.xml META-INF/template-logback.xml WEB-INF/classes/META-INF/atom-server.cfg.xml -d . \
4534
&& mv META-INF/application-context.xml WEB-INF/classes/META-INF/atom-server.cfg.xml /etc/atomhopper/ \
4635
&& mv META-INF/template-logback.xml /etc/atomhopper/logback.xml \
4736
&& mv atomhopper.war ${CATALINA_HOME}/webapps/ROOT.war \
4837
&& rm -rf META-INF WEB-INF \
49-
&& chmod +x ${AH_HOME}/start.sh
38+
&& chmod +x ${AH_HOME}/start.sh
5039

5140
EXPOSE 8080
5241

0 commit comments

Comments
 (0)