[DEPLOY] Use Docker images from Docker Hub

This commit is contained in:
2023-02-10 13:59:38 +00:00
parent 555aae5d1c
commit 9967c081c9
4 changed files with 4 additions and 14 deletions

View File

@@ -88,12 +88,6 @@
cmd: docker compose pull {{ item }} cmd: docker compose pull {{ item }}
loop: loop:
- caddy - caddy
- name: Build custom images
ansible.builtin.command:
chdir: "{{ project_dir }}"
cmd: docker compose build {{ item }}
loop:
- server - server
- name: Start containers - name: Start containers

View File

@@ -2,8 +2,7 @@ version: '3.1'
services: services:
server: server:
image: breccia-network-mapper image: mgrove36/breccia-mapper:latest
container_name: network-mapper-server
build: {{ project_src_dir }} build: {{ project_src_dir }}
ports: ports:
- 8000:8000 - 8000:8000
@@ -15,11 +14,9 @@ services:
- {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z - {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static - static_files:/app/static
- media_files:/app/media - media_files:/app/media
- {{ project_dir }}/icon-192x192.png:/app/media/icon-192x192.png:ro
caddy: caddy:
image: caddy:2 image: caddy:2
container_name: network-mapper-caddy
restart: unless-stopped restart: unless-stopped
ports: ports:
- 80:80 - 80:80
@@ -29,6 +26,7 @@ services:
# Caddy serves static files collected by Django # Caddy serves static files collected by Django
- static_files:/srv/static:ro - static_files:/srv/static:ro
- media_files:/srv/media:ro - media_files:/srv/media:ro
- {{ project_dir }}/icon-192x192.png:/srv/media/icon-192x192.png:ro
- caddy_data:/data - caddy_data:/data
- caddy_config:/config - caddy_config:/config
depends_on: depends_on:

View File

@@ -2,8 +2,7 @@ version: '3.1'
services: services:
server: server:
image: breccia-network-mapper image: mgrove36/breccia-mapper:latest
container_name: network-mapper-server
build: . build: .
ports: ports:
- 8000:8000 - 8000:8000
@@ -15,11 +14,9 @@ services:
- ./db.sqlite3:/app/db.sqlite3:z - ./db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static - static_files:/app/static
- media_files:/app/media - media_files:/app/media
- ./icon-192x192.png:/app/media/icon-192x192.png:ro
caddy: caddy:
image: caddy:2 image: caddy:2
container_name: network-mapper-caddy
restart: unless-stopped restart: unless-stopped
ports: ports:
- 80:80 - 80:80
@@ -29,6 +26,7 @@ services:
# Caddy serves static files collected by Django # Caddy serves static files collected by Django
- static_files:/srv/static:ro - static_files:/srv/static:ro
- media_files:/srv/media:ro - media_files:/srv/media:ro
- ./icon-192x192.png:/srv/media/icon-192x192.png:ro
- caddy_data:/data - caddy_data:/data
- caddy_config:/config - caddy_config:/config
depends_on: depends_on:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB