add container tags

linktools-toolkit · Apr 6, 2024 · 92230e4 · 92230e4
1 parent 4c523a7
commit 92230e4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/src/linktools/assets/containers/100-nginx/Dockerfile b/src/linktools/assets/containers/100-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:alpine
+FROM nginx:{{ NGINX_TAG }}
 
 RUN apk --no-cache add openssl socat
 RUN curl https://get.acme.sh | sh -s [email protected] && \
@@ -19,15 +19,10 @@ ENV {{ key }} {{ value }}
     {%- endwith %}
 {%- endfor %}
 
-{% if DEBUG %}
-RUN acme.sh --issue  --debug --domain {{ ROOT_DOMAIN }} --domain *.{{ ROOT_DOMAIN }} --dns {{ ACME_DNS_API }}
-{% else %}
-RUN acme.sh --issue --domain {{ ROOT_DOMAIN }} --domain *.{{ ROOT_DOMAIN }} --dns {{ ACME_DNS_API }}
-{% endif %}
+RUN acme.sh --issue --debug --domain {{ ROOT_DOMAIN }} --domain *.{{ ROOT_DOMAIN }} --dns {{ ACME_DNS_API }}
 
 RUN acme.sh --install-cert --domain {{ ROOT_DOMAIN }} --domain *.{{ ROOT_DOMAIN }} \
     --cert-file /etc/certs/{{ ROOT_DOMAIN }}_cert.pem \
     --key-file /etc/certs/{{ ROOT_DOMAIN }}_key.pem \
     --fullchain-file /etc/certs/{{ ROOT_DOMAIN }}_fullchain.pem \
     --reloadcmd "nginx -s reload 2>/dev/null || true"
-
diff --git a/src/linktools/assets/containers/100-nginx/container.py b/src/linktools/assets/containers/100-nginx/container.py
@@ -49,6 +49,7 @@ def keys(self):
     @cached_property
     def configs(self):
         return dict(
+            NGINX_TAG="alpine",
             ROOT_DOMAIN=Config.Prompt(cached=True),
             WILDCARD_DOMAIN=Config.Confirm(default=False, cached=True),
             HTTP_PORT=Config.Prompt(default=80, type=int, cached=True),

diff --git a/src/linktools/assets/containers/110-portainer/compose.yml b/src/linktools/assets/containers/110-portainer/compose.yml
@@ -1,6 +1,6 @@
 services:
   portainer:
-    image: portainer/portainer-ce
+    image: portainer/portainer-ce:{{ PORTAINER_TAG }}
 #   {% if int(PORTAINER_EXPOSE_PORT, 0) > 0 %}
     ports:
       - '{{ PORTAINER_EXPOSE_PORT }}:9000'

diff --git a/src/linktools/assets/containers/110-portainer/container.py b/src/linktools/assets/containers/110-portainer/container.py
@@ -40,6 +40,7 @@ def dependencies(self) -> [str]:
     @cached_property
     def configs(self):
         return dict(
+            PORTAINER_TAG="alpine",
             PORTAINER_DOMAIN=self.get_nginx_domain(),
             PORTAINER_EXPOSE_PORT=None,
         )

diff --git a/src/linktools/assets/containers/120-flare/compose.yml b/src/linktools/assets/containers/120-flare/compose.yml
@@ -1,6 +1,6 @@
 services:
   flare:
-    image: soulteary/flare
+    image: soulteary/flare:{{ FLARE_TAG }}
     user: '{{ DOCKER_UID }}:{{ DOCKER_GID }}'
 #   {% if int(FLARE_EXPOSE_PORT, 0) > 0 %}
     ports:

diff --git a/src/linktools/assets/containers/120-flare/container.py b/src/linktools/assets/containers/120-flare/container.py
@@ -46,6 +46,7 @@ def configs(self):
         return dict(
             WILDCARD_DOMAIN=True,
 
+            FLARE_TAG="latest",
             FLARE_DISABLE_LOGIN=Config.Confirm(default=True, cached=True),
             FLARE_DOAMIN=self.get_nginx_domain(""),
             FLARE_EXPOSE_PORT=None,