From 9967c081c9d73cc35f788e6c0bce62530e8f6330 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Fri, 10 Feb 2023 13:59:38 +0000 Subject: [PATCH] [DEPLOY] Use Docker images from Docker Hub --- deploy/playbook.yml | 6 ------ deploy/templates/docker-compose.yml.j2 | 6 ++---- docker-compose.yml | 6 ++---- media/icon-192x192.png | Bin 6234 -> 0 bytes 4 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 media/icon-192x192.png diff --git a/deploy/playbook.yml b/deploy/playbook.yml index ed5fcf4..d34f126 100644 --- a/deploy/playbook.yml +++ b/deploy/playbook.yml @@ -88,12 +88,6 @@ cmd: docker compose pull {{ item }} loop: - caddy - - - name: Build custom images - ansible.builtin.command: - chdir: "{{ project_dir }}" - cmd: docker compose build {{ item }} - loop: - server - name: Start containers diff --git a/deploy/templates/docker-compose.yml.j2 b/deploy/templates/docker-compose.yml.j2 index 9196400..71c5933 100755 --- a/deploy/templates/docker-compose.yml.j2 +++ b/deploy/templates/docker-compose.yml.j2 @@ -2,8 +2,7 @@ version: '3.1' services: server: - image: breccia-network-mapper - container_name: network-mapper-server + image: mgrove36/breccia-mapper:latest build: {{ project_src_dir }} ports: - 8000:8000 @@ -15,11 +14,9 @@ services: - {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z - static_files:/app/static - media_files:/app/media - - {{ project_dir }}/icon-192x192.png:/app/media/icon-192x192.png:ro caddy: image: caddy:2 - container_name: network-mapper-caddy restart: unless-stopped ports: - 80:80 @@ -29,6 +26,7 @@ services: # Caddy serves static files collected by Django - static_files:/srv/static:ro - media_files:/srv/media:ro + - {{ project_dir }}/icon-192x192.png:/srv/media/icon-192x192.png:ro - caddy_data:/data - caddy_config:/config depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 586524a..3eedd02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,7 @@ version: '3.1' services: server: - image: breccia-network-mapper - container_name: network-mapper-server + image: mgrove36/breccia-mapper:latest build: . ports: - 8000:8000 @@ -15,11 +14,9 @@ services: - ./db.sqlite3:/app/db.sqlite3:z - static_files:/app/static - media_files:/app/media - - ./icon-192x192.png:/app/media/icon-192x192.png:ro caddy: image: caddy:2 - container_name: network-mapper-caddy restart: unless-stopped ports: - 80:80 @@ -29,6 +26,7 @@ services: # Caddy serves static files collected by Django - static_files:/srv/static:ro - media_files:/srv/media:ro + - ./icon-192x192.png:/srv/media/icon-192x192.png:ro - caddy_data:/data - caddy_config:/config depends_on: diff --git a/media/icon-192x192.png b/media/icon-192x192.png deleted file mode 100644 index 311b68fe6fcbe0488fc005303d1b99cc44e724a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6234 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 r=xmOv@q~?|d_U`QZu)I6lPP4lse}_jI