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.

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

Jump to bottom

modify expected .env and docker composes #349

Merged
merged 1 commit into from
Sep 7, 2023
Merged

modify expected .env and docker composes #349

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 docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ services:
TZ: ${TIMEZONE:-Europe/Bratislava}
DSPACE_UI_SSL: 'false'
DSPACE_UI_HOST: dspace-angular
DSPACE_UI_PORT: 400${INSTANCE}
DSPACE_UI_PORT: 4000
DSPACE_UI_NAMESPACE: /
DSPACE_REST_SSL: 'false'
DSPACE_REST_HOST: ${DSPACE_REST_HOST:-localhost}
DSPACE_REST_PORT: 8${INSTANCE}
DSPACE_REST_SSL: ${DSPACE_SSL:-false}
DSPACE_REST_HOST: ${DSPACE_HOST:-localhost}
DSPACE_REST_PORT: ${DSPACE_REST_PORT}
DSPACE_REST_NAMESPACE: /server
image: ${DSPACE_UI_IMAGE:-dataquest/dspace-angular:dspace-7_x}
volumes:
Expand All @@ -31,10 +31,10 @@ services:
dockerfile: Dockerfile
networks:
dspacenet:
entrypoint: yarn start:dev
entrypoint: ${FE_CMD:-/bin/sh -c "pm2 start dspace-ui.json && pm2 logs"}
ports:
- published: 400${INSTANCE}
target: 400${INSTANCE}
target: 4000
host_ip: 127.0.0.1
- published: 987${INSTANCE}
target: 987${INSTANCE}
Expand Down
9 changes: 1 addition & 8 deletions dspace-ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,7 @@
"script": "dist/server/main.js",
"instances": "7",
"exec_mode": "cluster",
"node_args": "--max_old_space_size=4096",
"env": {
"NODE_ENV": "production",
"DSPACE_REST_SSL": "true",
"DSPACE_REST_HOST": "dspace.tul.cz",
"DSPACE_REST_PORT": "443",
"DSPACE_REST_NAMESPACE": "/server"
}
"node_args": "--max_old_space_size=4096"
}
]
}
Loading