]> Untitled Git - web-gallery.git/commitdiff
projects / web-gallery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d9f3ffa)
Updated to 1.7.0 master 1.7.0
authorClifton Palmer <clifton.james.palmer@protonmail.com>
Mon, 16 Dec 2024 09:50:58 +0000 (03:50 -0600)
committerClifton Palmer <clifton.james.palmer@protonmail.com>
Mon, 16 Dec 2024 09:52:55 +0000 (03:52 -0600)
* Using nginx alpine for server
* Using flask template inheritance

docker-compose-prod.yml patch | blob | history
docker-compose.yml patch | blob | history
navigator/app/templates/base.html [new file with mode: 0644] patch | blob
navigator/app/templates/gallery.html patch | blob | history
navigator/app/templates/page.html patch | blob | history
navigator/app/templates/pages.html patch | blob | history
server/Dockerfile patch | blob | history
server/default.conf [new file with mode: 0644] patch | blob
server/nginx.conf [deleted file] patch | blob | history

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index c62f3210659966e30b039d7e129316adc7f1a87f..679110ef4460cfde7b0bfe874b74edfc8ac2d65c 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -6,13 +6,13 @@ networks:
         driver: overlay
 services:
     navigator:
         driver: overlay
 services:
     navigator:
-        image: cjpalmer/gallery-navigator:1.6.0
+        image: cjpalmer/gallery-navigator:1.7.0
         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:
         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:
-        image: cjpalmer/gallery-server:1.6.0
+        image: cjpalmer/gallery-server:1.7.0
         volumes:
         - gallery_data:/data/images
         depends_on:
         volumes:
         - gallery_data:/data/images
         depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index 56a649b850bc5e91cb9a8ffbb0a97af6471f9005..f6334cebfc9713c2ad146c4406dffe21366bd755 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     navigator:
         build: ./navigator
 services:
     navigator:
         build: ./navigator
-        image: cjpalmer/gallery-navigator:1.6.0
+        image: cjpalmer/gallery-navigator:1.7.0
         volumes:
         - ./navigator/app:/app # dev testing
         - gallery_data_dev:/app/gallery
         volumes:
         - ./navigator/app:/app # dev testing
         - gallery_data_dev:/app/gallery
@@ -10,7 +10,7 @@ services:
             FLASK_DEBUG: 1
     server:
         build: ./server
             FLASK_DEBUG: 1
     server:
         build: ./server
-        image: cjpalmer/gallery-server:1.6.0
+        image: cjpalmer/gallery-server:1.7.0
         volumes:
         - gallery_data_dev:/data/images
         ports:
         volumes:
         - gallery_data_dev:/data/images
         ports:
diff --git a/navigator/app/templates/base.html b/navigator/app/templates/base.html
new file mode 100644 (file)
index 0000000..7bbcd1f
--- /dev/null
+++ b/navigator/app/templates/base.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<head>
+    <title>{% block title %}{% endblock %}</title>
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/colors.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/index.css') }}">
+</head>
+<body class="first-color">
+    <div class="titlecard second-color">
+    {% block content %}{% endblock %}
+    </div>
+</body>
+</html>
diff --git a/navigator/app/templates/gallery.html b/navigator/app/templates/gallery.html
index d9404e08740cef6c59452c118fa5bd1007dd087d..72c7f33b76b27d06d4e94583f68ae675c4602400 100644 (file)
--- a/navigator/app/templates/gallery.html
+++ b/navigator/app/templates/gallery.html
@@ -1,21 +1,17 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>{{ title }}</title>
-    <link rel="stylesheet" type="text/css" href="static/css/colors.css" />
-    <link rel="stylesheet" type="text/css" href="static/css/index.css" />
-</head>
-<body class="first-color">
-    <div class="titlecard second-color">
-    <h1>{{ title }}</h1>
+{% extends 'base.html' %}
 
 
-    <ul class="card third-color" id="navigation">
-    {% for gallery in galleries %}
-        <li class="link fourth-color">
-            <a href="{{ gallery }}">{{ gallery }}</a>
-        </li>
-    {% endfor %}
-    </ul>
-    </div>
-</body>
-</html>
+{% block title %}
+{{ title }}
+{% endblock %}
+
+{% block content %}
+<h1>{{ title }}</h1>
+
+<ul class="card third-color" id="navigation">
+{% for gallery in galleries %}
+    <li class="link fourth-color">
+        <a href="{{ gallery }}">{{ gallery }}</a>
+    </li>
+{% endfor %}
+</ul>
+{% endblock %}
diff --git a/navigator/app/templates/page.html b/navigator/app/templates/page.html
index fe075ede7cfe4a1e6838711f23b88d54fad2fcb4..3668625aaf4e726efadf8534019d9183ae1267d0 100644 (file)
--- a/navigator/app/templates/page.html
+++ b/navigator/app/templates/page.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html lang="en">
 <head>
     <title>{{ title }}</title>
 </head>
 <head>
     <title>{{ title }}</title>
 </head>
diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html
index 9b4a70de45693406664ad0bc1fe48e0d101a61e2..8ff8c83ee415694dadcef1f494f63c90fe88200a 100644 (file)
--- a/navigator/app/templates/pages.html
+++ b/navigator/app/templates/pages.html
@@ -1,28 +1,22 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>{{ title }}</title>
-    <link rel="stylesheet" type="text/css" href="static/css/colors.css" />
-    <link rel="stylesheet" type="text/css" href="static/css/index.css" />
-</head>
-<body class="first-color">
-    <div class="titlecard second-color">
+{% extends 'base.html' %}
 
 
-    {% if header %}
-    <div class="card third-color">
-    {% autoescape false %}
-    {{ header }}
-    {% endautoescape %}
-    </div>
-    {% endif %}
+{% block title %}
+{{ title }}
+{% endblock %}
 
 
-    <ul class="card third-color" id="navigation">
-    {% for page in pages %}
-        <li class="link fourth-color">
-            <a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a>
-        </li>
-    {% endfor %}
-    </ul>
-    </div>
-</body>
-</html>
+{% block content %}
+{% if header %}
+<div class="card third-color">
+{% autoescape false %}
+{{ header }}
+{% endautoescape %}
+</div>
+{% endif %}
+
+<ul class="card third-color" id="navigation">
+{% for page in pages %}
+    <li class="link fourth-color">
+        <a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a>
+    </li>
+{% endfor %}
+{% endblock %}
diff --git a/server/Dockerfile b/server/Dockerfile
index 139fc0100589f6ad63997b117d78d31c2433232d..6ef3ba904dcc14ddc5d846e2aaa1d0f9ca917922 100644 (file)
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx:1.17
+FROM nginx:1.27-alpine
 
 
-COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY ./default.conf /etc/nginx/conf.d/default.conf
diff --git a/server/default.conf b/server/default.conf
new file mode 100644 (file)
index 0000000..720200c
--- /dev/null
+++ b/server/default.conf
@@ -0,0 +1,9 @@
+server {
+    location / {
+        proxy_pass http://navigator:5000;
+    }
+
+    location /images {
+        root /data;
+    }
+}
diff --git a/server/nginx.conf b/server/nginx.conf
deleted file mode 100644 (file)
index 63aacef..0000000
--- a/server/nginx.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-worker_processes auto;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    server {
-        location / {
-            proxy_pass http://navigator:5000;
-        }
-
-        location /images {
-            root /data;
-        }
-    }
-}
Dockerized gallery for browsing my comics