Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README and add example Docker Compose file #1329

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ jobs:
with:
working-directory: frontend/src/main/frontend/
build: npm run build:prod
start: docker-compose up -d
start: docker-compose -f ../../../../docker-compose.demo.yml up -d
wait-on: "http://localhost:8080/"
wait-on-timeout: 360
17 changes: 0 additions & 17 deletions .run/StandaloneInitializer.run.xml

This file was deleted.

16 changes: 7 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# This image is created for the https://flow.frankframework.org demo.
FROM frankframework/frankframework:latest
FROM eclipse-temurin:21-jre-alpine

ENV dtap.stage="LOC"
ENV database.instance.name="frank2frankflow"
ENV database.name="database"
ENV CATALINA_OPTS="-Dinstance.name=Frank2FrankFlow"
COPY frank-flow/target/frank-flow-*.war /opt/frank-flow/frank-flow.war

COPY --chown=tomcat ./frontend/src/main/frontend/cypress/Frank/src/main/ /opt/frank/
COPY --chown=tomcat ./context.xml /usr/local/tomcat/conf/context.xml
COPY --chown=tomcat ./frank-flow/target/frank-flow-3.0.0-SNAPSHOT.war /usr/local/tomcat/webapps/frank-flow.war
EXPOSE 8080

WORKDIR /opt/frank-flow

ENTRYPOINT ["java", "-jar", "frank-flow.war"]
5 changes: 5 additions & 0 deletions Dockerfile.demo
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This image is created for the https://flow.frankframework.org demo.
FROM frankframework/frankframework:latest

COPY --chown=tomcat ./frontend/src/main/frontend/cypress/Frank/src/main/ /opt/frank/
COPY --chown=tomcat ./frank-flow/target/frank-flow-3.0.0-SNAPSHOT.war /usr/local/tomcat/webapps/frank-flow.war
200 changes: 114 additions & 86 deletions README.md

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions docker-compose.demo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: "3"

services:
frank:
image: frank-flow-demo
build:
context: .
dockerfile: Dockerfile.demo
ports:
- "8080:8080"
restart: unless-stopped
16 changes: 11 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
version: "3"

services:
frank:
frankframework:
image: frankframework/frankframework:latest
ports:
- "8080:8080"
volumes: &frank-volumes
- ./frontend/src/main/frontend/cypress/Frank/src/main/:/opt/frank/
environment:
management.gateway.inbound.class: "org.frankframework.management.gateway.HazelcastInboundGateway"
frank-flow:
image: frank-flow
build: .
ports:
- "8080:8080"
restart: unless-stopped
- "8081:8080"
volumes: *frank-volumes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
configurations.names=FrankConfig.xsd
classloader.type=ScanningDirectoryClassLoader
configurations.directory.autoLoad=true

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
jdbc:
- name: 'ibis'
type: 'org.h2.jdbcx.JdbcDataSource'
url: 'jdbc:h2:mem:ibis4test;NON_KEYWORDS=VALUE;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;TRACE_LEVEL_FILE=0;'

This file was deleted.

Loading