Skip to content

Commit

Permalink
Revert "Merge pull request #69 from Sudwest-Fryslan/session-research"
Browse files Browse the repository at this point in the history
This reverts commit 21a2235, reversing
changes made to 5c77670.
  • Loading branch information
DelanoWAF committed Feb 23, 2024
1 parent a19ff15 commit e89d305
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1,450 deletions.
23 changes: 11 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ FROM frankframework/frankframework:7.9-20231028.143509


# Copy dependencies
COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
COPY --chown=tomcat lib/webapp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/
# COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
# COPY --chown=tomcat lib/webapp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/

# Compile custom class, this should be changed to a buildstep in the future
# COPY --chown=tomcat java /tmp/java
# RUN javac \
# /tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
# /tmp/java/nl/nn/adapterframework/http/HttpSessionBase.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

# Compile custom class, this should be changed to a buildstep in the future
# Add lombok.jar to lib/server to be able to compile custom code with Lombok annotations
COPY --chown=tomcat java /tmp/java
RUN javac \
/tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
/tmp/java/nl/nn/adapterframework/http/HttpSessionBase.java \
/tmp/java/nl/nn/adapterframework/http/HttpSession.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 database connection settings
COPY --chown=tomcat context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml

Expand Down
Loading

0 comments on commit e89d305

Please sign in to comment.