diff options
author | Daniel Wiesenberg <weasy@hotmail.de> | 2020-08-24 23:30:39 +0200 |
---|---|---|
committer | Daniel Wiesenberg <weasy@hotmail.de> | 2020-08-25 09:02:45 +0200 |
commit | 38ac3e42be87509ec04c35adfb65b3ba89daecbf (patch) | |
tree | 20c83da8732a29f84665a3a66c0168a09f437639 /docker-compose.yml | |
parent | 0f524955b24a88b384fb72d97c6386a17996083e (diff) | |
download | conduit-38ac3e42be87509ec04c35adfb65b3ba89daecbf.zip |
Docker add healthcheck and mention Docker Hub image
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index afd3699..f06eaca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,18 +3,19 @@ version: '3' services: homeserver: - ### If you already built the Conduit image with 'docker build', then you can uncomment the - ### 'image' line and comment out the 'build' option. - # image: conduit_homeserver:latest - ### If you want meaningful labels in you built Conduit image, you should run docker-compose like this: + ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image, + ### then you are ready to go. + image: matrixconduit/matrix-conduit:latest + ### If you want to build a fresh image from the sources, then comment the image line and uncomment the + ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this: ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d - build: - context: . - args: - CREATED: - VERSION: - LOCAL: "false" - GIT_REF: HEAD + # build: + # context: . + # args: + # CREATED: + # VERSION: + # LOCAL: 'false' + # GIT_REF: HEAD restart: unless-stopped ports: - 8448:8000 |