From 3b35ce0262af8e4e74fc6f9f29e22cecf9a4a652 Mon Sep 17 00:00:00 2001 From: Markos Gogoulos Date: Mon, 8 Mar 2021 21:54:09 +0200 Subject: [PATCH] use mediacms image from docker hub (#69) * use mediacms image from docker hub --- README.md | 4 ++-- docker-compose-http-proxy.yaml | 11 ++++------- docker-compose-https-proxy.yaml | 11 ++++------- docker-compose-named-volumes.yaml | 11 ++++------- docker-compose.yaml | 13 +++++-------- 5 files changed, 19 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 0558966..68a5b03 100644 --- a/README.md +++ b/README.md @@ -92,10 +92,10 @@ The default option to serve MediaCMS is on http://localhost. If you want to set Now run ```bash -docker-compose build && docker-compose up +docker-compose up ``` -This will build an image, download and setup necessary Docker images and start all containers. Once it finishes, MediaCMS will be installed and available on http://localhost (or the url you've set as `FRONTEND_HOST` on file `deploy/docker/local_settings.py`) +This will download all MediaCMS related Docker images and start all containers. Once it finishes, MediaCMS will be installed and available on http://localhost (or the url you've set as `FRONTEND_HOST` on file `deploy/docker/local_settings.py`) For more instructions, checkout the docs on the [Docker deployment](docs/Docker_deployment.md) page. Docker Compose support has been contributed by @swiftugandan. diff --git a/docker-compose-http-proxy.yaml b/docker-compose-http-proxy.yaml index 7db3f1f..11df078 100644 --- a/docker-compose-http-proxy.yaml +++ b/docker-compose-http-proxy.yaml @@ -9,7 +9,7 @@ services: - /var/run/docker.sock:/tmp/docker.sock:ro - ./deploy/docker/reverse_proxy/client_max_body_size.conf:/etc/nginx/conf.d/client_max_body_size.conf:ro migrations: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./:/home/mediacms.io/mediacms/ environment: @@ -24,10 +24,7 @@ services: db: condition: service_healthy web: - build: - context: . - target: runtime-image - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 volumes: @@ -41,7 +38,7 @@ services: depends_on: - migrations celery_beat: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./:/home/mediacms.io/mediacms/ environment: @@ -53,7 +50,7 @@ services: depends_on: - redis celery_worker: - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 volumes: diff --git a/docker-compose-https-proxy.yaml b/docker-compose-https-proxy.yaml index 76f84d0..b0e8793 100644 --- a/docker-compose-https-proxy.yaml +++ b/docker-compose-https-proxy.yaml @@ -11,7 +11,7 @@ services: - ./deploy/docker/reverse_proxy/certs/:/etc/nginx/certs/ - ./deploy/docker/reverse_proxy/client_max_body_size.conf:/etc/nginx/conf.d/client_max_body_size.conf:ro migrations: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./:/home/mediacms.io/mediacms/ environment: @@ -26,10 +26,7 @@ services: db: condition: service_healthy web: - build: - context: . - target: runtime-image - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 volumes: @@ -43,7 +40,7 @@ services: depends_on: - migrations celery_beat: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./:/home/mediacms.io/mediacms/ environment: @@ -55,7 +52,7 @@ services: depends_on: - redis celery_worker: - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 2 volumes: diff --git a/docker-compose-named-volumes.yaml b/docker-compose-named-volumes.yaml index fc22cd0..52f8229 100644 --- a/docker-compose-named-volumes.yaml +++ b/docker-compose-named-volumes.yaml @@ -2,7 +2,7 @@ version: "3" services: migrations: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./deploy/docker/local_settings.py:/home/mediacms.io/mediacms/deploy/docker/local_settings.py environment: @@ -17,10 +17,7 @@ services: db: condition: service_healthy web: - build: - context: . - target: runtime-image - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 ports: @@ -37,7 +34,7 @@ services: depends_on: - migrations celery_beat: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./deploy/docker/local_settings.py:/home/mediacms.io/mediacms/deploy/docker/local_settings.py environment: @@ -49,7 +46,7 @@ services: depends_on: - redis celery_worker: - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 volumes: diff --git a/docker-compose.yaml b/docker-compose.yaml index a5d853d..da35826 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3" services: migrations: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./:/home/mediacms.io/mediacms/ environment: @@ -17,10 +17,7 @@ services: db: condition: service_healthy web: - build: - context: . - target: runtime-image - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 ports: @@ -35,7 +32,7 @@ services: depends_on: - migrations celery_beat: - image: mediacms:latest + image: mediacms/mediacms:latest volumes: - ./:/home/mediacms.io/mediacms/ environment: @@ -47,7 +44,7 @@ services: depends_on: - redis celery_worker: - image: mediacms:latest + image: mediacms/mediacms:latest deploy: replicas: 1 volumes: @@ -80,4 +77,4 @@ services: test: ["CMD", "redis-cli","ping"] interval: 30s timeout: 10s - retries: 3 \ No newline at end of file + retries: 3