Skip to content

Commit

Permalink
Merge branch 'main' into alchemiscale-fah
Browse files Browse the repository at this point in the history
  • Loading branch information
dotsdl authored Jul 9, 2024
2 parents 2763efc + 9386907 commit 98dd3f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/alchemiscale-compute/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mambaorg/micromamba:1.4.1

LABEL org.opencontainers.image.source=https://github.com/openforcefield/alchemiscale-compute
LABEL org.opencontainers.image.source=https://github.com/openforcefield/alchemiscale
LABEL org.opencontainers.image.description="deployable compute services for an alchemiscale server"
LABEL org.opencontainers.image.licenses=MIT

Expand Down
4 changes: 2 additions & 2 deletions docker/alchemiscale-server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
- "traefik.http.routers.alchemiscale-client-API.rule=Host(`api.${HOST_DOMAIN:?err}`)"
- "traefik.http.routers.alchemiscale-client-API.entrypoints=websecure"
- "traefik.http.routers.alchemiscale-client-API.tls.certresolver=myresolver"
- "traefik.docker.network=docker_internal"
- "traefik.docker.network=alchemiscale-server_internal"
healthcheck:
test: ["CMD", "/opt/conda/bin/curl", "-f", "http://localhost:1840/ping"]
interval: 1m
Expand Down Expand Up @@ -125,7 +125,7 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.alchemiscale-compute-API.rule=Host(`compute.${HOST_DOMAIN:?err}`)"
- "traefik.docker.network=docker_internal"
- "traefik.docker.network=alchemiscale-server_internal"
- "traefik.http.routers.alchemiscale-compute-API.entrypoints=websecure"
- "traefik.http.routers.alchemiscale-compute-API.tls.certresolver=myresolver"
healthcheck:
Expand Down

0 comments on commit 98dd3f2

Please sign in to comment.