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

Deploy s3 to swarm stack #1134

Merged
merged 3 commits into from
Feb 7, 2024
Merged

Deploy s3 to swarm stack #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e894115
Change Environment Variable to HTTPS
AvocadoMoon Feb 6, 2024
c8b69b3
Escape $ Sign
AvocadoMoon Feb 6, 2024
cd88997
Forgot to Apply Changes to Actual Compose File
AvocadoMoon Feb 6, 2024
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 docker/swarm/docker-compose-small.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ services:
- "127.0.0.1:${VCELL_S3PROXY_PORT_EXTERNAL}:80"
volumes:
- "${VCELL_N5_DATADIR_HOST}:/data:ro"
entrypoint: ["sh", "-c", 'export S3PROXY_KEYSTORE_PASSWORD=$(cat /run/secrets/keystorepswd); /opt/s3proxy/run-docker-container.sh']
entrypoint: ['sh', '-c', 'export S3PROXY_KEYSTORE_PASSWORD=$$(cat /run/secrets/keystorepswd); /opt/s3proxy/run-docker-container.sh']
secrets:
- keystorefile
- keystorepswd
Expand Down
2 changes: 1 addition & 1 deletion docker/swarm/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ services:
- "${VCELL_S3PROXY_PORT_EXTERNAL}:443"
volumes:
- "${VCELL_N5_DATADIR_HOST}:/data:ro"
entrypoint: [ "sh", "-c", 'export S3PROXY_KEYSTORE_PASSWORD=$(cat /run/secrets/keystorepswd); /opt/s3proxy/run-docker-container.sh' ]
entrypoint: [ 'sh', '-c', 'export S3PROXY_KEYSTORE_PASSWORD=$$(cat /run/secrets/keystorepswd); /opt/s3proxy/run-docker-container.sh' ]
secrets:
- keystorefile
- keystorepswd
Expand Down
6 changes: 4 additions & 2 deletions docker/swarm/serverconfig-uch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,23 @@ case $VCELL_SITE in
REL)
_site_port_offset=0
VCELL_API_HOST_EXTERNAL=vcellapi.cam.uchc.edu
VCELL_S3_EXPORT_BASEURL=http://vcellapi.cam.uchc.edu
VCELL_S3_EXPORT_BASEURL=https://vcellapi.cam.uchc.edu
VCELL_API_PORT_EXTERNAL=443
VCELL_DEBUG_PORT_BASE=5000
_applicationId="1471-8022-1038-5553"
;;
BETA)
_site_port_offset=1
VCELL_API_HOST_EXTERNAL=http://vcellapi.cam.uchc.edu
VCELL_S3_EXPORT_BASEURL=https://vcellapi.cam.uchc.edu
VCELL_API_PORT_EXTERNAL=443
VCELL_DEBUG_PORT_BASE=5010
_applicationId="1471-8022-1038-5552"
;;
ALPHA)
_site_port_offset=2
VCELL_API_HOST_EXTERNAL=vcellapi-beta.cam.uchc.edu
VCELL_S3_EXPORT_BASEURL=http://vcellapi-beta.cam.uchc.edu
VCELL_S3_EXPORT_BASEURL=https://vcellapi-beta.cam.uchc.edu
VCELL_API_PORT_EXTERNAL=8080
VCELL_DEBUG_PORT_BASE=5020
_applicationId="1471-8022-1038-5554"
Expand All @@ -63,6 +64,7 @@ case $VCELL_SITE in
_site_port_offset=3
# VCELL_API_PORT_EXTERNAL=8081
VCELL_API_HOST_EXTERNAL=http://vcellapi-test.cam.uchc.edu
VCELL_S3_EXPORT_BASEURL=https://vcellapi-test.cam.uchc.edu
VCELL_API_PORT_EXTERNAL=443
VCELL_DEBUG_PORT_BASE=5030
_applicationId="1471-8022-1038-5555"
Expand Down
Loading