Skip to content

Commit

Permalink
fix: previous update with ladybug datasource disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
DelanoWAF committed Apr 19, 2024
1 parent 0f243b5 commit 33e6e43
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 4,678 deletions.
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Equal to Framework version: 7.9-20230622.190018
# FROM frankframework/frankframework:8.1.0-RC2-20240416.011135
FROM wearefrank/zaakbrug-base:5357284526
FROM frankframework/frankframework:8.1.0-20240404.042328
# FROM wearefrank/zaakbrug-base:5357284526

# Copy dependencies
COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
Expand All @@ -13,14 +13,14 @@ COPY --chown=tomcat context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.x
COPY --chown=tomcat classes/ /opt/frank/resources/

# Compile custom class, this should be changed to a buildstep in the future
COPY --chown=tomcat java /tmp/java
RUN javac \
/tmp/java/nextapp/echo2/webcontainer/syncpeer/TextComponentPeer.java \
/tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
/tmp/java/nl/nn/adapterframework/parameters/Parameter.java \
-classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
-verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
RUN rm -rf /tmp/java
# COPY --chown=tomcat java /tmp/java
# RUN javac \
# /tmp/java/nextapp/echo2/webcontainer/syncpeer/TextComponentPeer.java \
# /tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
# /tmp/java/nl/nn/adapterframework/parameters/Parameter.java \
# -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
# -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
# RUN rm -rf /tmp/java

HEALTHCHECK --interval=15s --timeout=5s --start-period=30s --retries=60 \
CMD curl --fail --silent http://localhost:8080/iaf/api/server/health || (curl --silent http://localhost:8080/iaf/api/server/health && exit 1)
1 change: 1 addition & 0 deletions classes/DeploymentSpecifics.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ configurations.database.autoLoad=true
configurations.names=

jdbc.migrator.active=true
ladybug.jdbc.datasource=

# Ladybug related properties
ibistesttool.custom=Custom
Expand Down
Loading

0 comments on commit 33e6e43

Please sign in to comment.