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 311b68f..0000000 Binary files a/media/icon-192x192.png and /dev/null differ