From 17e2bbe79fb35e0422b14a63bafb8be48a0a8d78 Mon Sep 17 00:00:00 2001 From: Clifton Palmer Date: Tue, 31 Oct 2023 15:25:41 -0500 Subject: [PATCH] Version update 1.1.0 * Fixed templates not being copied into their folders * Refactored navigator and server layout * Added prod compose file --- docker-compose-prod.yml | 25 ++++++++++++++++ docker-compose.yml | 30 +++++++------------ Dockerfile => navigator/Dockerfile | 4 +-- {app => navigator/app}/app.py | 0 {app => navigator/app}/templates/gallery.html | 0 {app => navigator/app}/templates/hello.html | 0 {app => navigator/app}/templates/page.html | 0 {app => navigator/app}/templates/pages.html | 0 .../requirements.txt | 0 server/Dockerfile | 3 ++ nginx.conf => server/nginx.conf | 2 +- 11 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 docker-compose-prod.yml rename Dockerfile => navigator/Dockerfile (82%) rename {app => navigator/app}/app.py (100%) rename {app => navigator/app}/templates/gallery.html (100%) rename {app => navigator/app}/templates/hello.html (100%) rename {app => navigator/app}/templates/page.html (100%) rename {app => navigator/app}/templates/pages.html (100%) rename requirements.txt => navigator/requirements.txt (100%) create mode 100644 server/Dockerfile rename nginx.conf => server/nginx.conf (80%) diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml new file mode 100644 index 0000000..7e64b7f --- /dev/null +++ b/docker-compose-prod.yml @@ -0,0 +1,25 @@ +version: '3' +networks: + proxy: + external: true +services: + navigator: + image: cjpalmer/gallery-navigator:1.1.0 + volumes: + - gallery_data:/app/gallery + server: + image: cjpalmer/gallery-server:1.1.0 + volumes: + - gallery_data:/data/images + depends_on: + - navigator + networks: + - default + - proxy +volumes: + gallery_data: + driver: local + driver_opts: + o: bind + type: none + device: /mnt/gallery_data diff --git a/docker-compose.yml b/docker-compose.yml index 0dcd450..312c82d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,31 +1,21 @@ version: '3' services: - db: - image: postgres:13.4-alpine + navigator: + build: ./navigator + image: cjpalmer/gallery-navigator:1.1.0 + volumes: + - gallery_data:/app/gallery environment: - POSTGRES_USER: admin - POSTGRES_PASSWORD: adminpw - ports: - - 5432:5432 - web: - image: nginx:1.17 + FLASK_DEBUG: 1 + server: + build: ./server + image: cjpalmer/gallery-server:1.1.0 volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - gallery_data:/data/images ports: - 80:80 depends_on: - - gallery - gallery: - build: . - image: cjpalmer/gallery:1.0.0 - volumes: - - gallery_data:/app/gallery - - ./app:/app - environment: - FLASK_DEBUG: 1 - depends_on: - - db + - navigator volumes: gallery_data: driver: local diff --git a/Dockerfile b/navigator/Dockerfile similarity index 82% rename from Dockerfile rename to navigator/Dockerfile index 1d580e7..6591257 100644 --- a/Dockerfile +++ b/navigator/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /app COPY ./requirements.txt /app RUN pip install -r requirements.txt -COPY ./app/app.py /app -COPY ./app/templates /app +COPY ./app/app.py /app +COPY ./app/templates/ /app/templates/ CMD ["flask", "run"] diff --git a/app/app.py b/navigator/app/app.py similarity index 100% rename from app/app.py rename to navigator/app/app.py diff --git a/app/templates/gallery.html b/navigator/app/templates/gallery.html similarity index 100% rename from app/templates/gallery.html rename to navigator/app/templates/gallery.html diff --git a/app/templates/hello.html b/navigator/app/templates/hello.html similarity index 100% rename from app/templates/hello.html rename to navigator/app/templates/hello.html diff --git a/app/templates/page.html b/navigator/app/templates/page.html similarity index 100% rename from app/templates/page.html rename to navigator/app/templates/page.html diff --git a/app/templates/pages.html b/navigator/app/templates/pages.html similarity index 100% rename from app/templates/pages.html rename to navigator/app/templates/pages.html diff --git a/requirements.txt b/navigator/requirements.txt similarity index 100% rename from requirements.txt rename to navigator/requirements.txt diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 0000000..139fc01 --- /dev/null +++ b/server/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:1.17 + +COPY ./nginx.conf /etc/nginx/nginx.conf diff --git a/nginx.conf b/server/nginx.conf similarity index 80% rename from nginx.conf rename to server/nginx.conf index cff3e3b..63aacef 100644 --- a/nginx.conf +++ b/server/nginx.conf @@ -7,7 +7,7 @@ events { http { server { location / { - proxy_pass http://gallery:5000; + proxy_pass http://navigator:5000; } location /images { -- 2.47.2