Skip to content

WIP: Align more of the docker-compose and GitHub Actions settings #819

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: Align more of the docker-compose and GitHub Actions settings #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ jobs:
IMAGE_PROCESSOR: 'graphicsmagick'
services:
fedora:
image: samvera/fcrepo4:4.7.5-cgroup1
image: cazzerson/fcrepo4:4.7.5
ports:
- 8080:8080
env:
CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dfcrepo.modeshape.configuration=classpath:/config/file-simple/repository.json"
redis:
image: redis
image: redis:5.0.14
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
Expand All @@ -57,7 +57,7 @@ jobs:
ports:
- 6379:6379
postgres:
image: postgres
image: postgres:9.6-alpine
env:
POSTGRES_USER: hyrax
POSTGRES_PASSWORD: password
Expand All @@ -68,13 +68,13 @@ jobs:
--health-timeout 5s
ports: ["5432:5432"]
solr:
image: solr:6.6
image: solr:6.6.6-alpine
ports:
- 8983:8983
options: >-
--name solr_container
clamavd:
image: lokori/clamav-java
image: tiredofit/clamav
ports:
- 3310:3310
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
volumes:
- fcrepo_data:/usr/local/tomcat/fcrepo4-data/fcrepo.binary.directory
environment:
CATALINA_OPTS: "-Djava.awt.headless=true -server -Xms1G -Xmx2G -XX:MaxNewSize=1G -XX:+HeapDumpOnOutOfMemoryError -Dfcrepo.modeshape.configuration=classpath:/config/file-simple/repository.json"
CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dfcrepo.modeshape.configuration=classpath:/config/file-simple/repository.json"
stdin_open: true
tty: true
redis:
Expand Down