3.1.0 (squash)

Author: pascalandy

Dockerfile

@@ -1,6 +1,21 @@
-# The Dockerfile is not a real Dockerfile. 
-# Those vars are used broadly outside this Dockerfile
-# Github Action CI and release script (./utility.sh) is consuming these variables.
-ARG VERSION="3.0.0"
+###################################
+# REQUIRED for bashLaVa https://github.com/firepress-org/bashlava
+# REQUIRED for Github Action CI template https://github.com/firepress-org/ghostfire/tree/master/.github/workflows
+###################################
+
 ARG APP_NAME="docker-stack-this"
+ARG VERSION="3.1.0"
+ARG RELEASE="3.1.0"
+ARG GITHUB_USER="pascalandy"
+
+###################################
+# REQUIRED BY OUR GITHUB ACTION CI
+###################################
+
 ARG GIT_PROJECT_NAME="docker-stack-this"
+ARG DOCKERHUB_USER="devmtl"
+ARG GITHUB_ORG="firepress-org"
+ARG GITHUB_REGISTRY="registry"
+
+ARG GIT_REPO_DOCKERFILE="https://github.com/pascalandy/docker-stack-this"
+ARG GIT_REPO_SOURCE="https://github.com/pascalandy/docker-stack-this"

traefik_stack5/stack-proxy.yml

@@ -57,7 +57,7 @@ services:
   #    and capture client IP's
   traefik:
     <<: *default-opts
-    image: traefik:1.7.20
+    image: traefik:1.7.24
     ports:
     - target: 80
       protocol: tcp

traefik_stack6/rundown.sh

@@ -87,13 +87,9 @@ function goto_myscript() {
     message_is="stack-this"
     docker run --rm devmtl/figlet:1.0 ${message_is} && sleep 2 && echo && \
 
-    # If existing, remove stacks: "
-    ./rundown.sh && \
 
-    # If not existing, create networks"
-    # create an overlay networks on docker swarm
+    # If not existing, create an overlay networks on docker swarm
     arr=( "ntw_front" "ntw_proxy" )
-
     for i in "${arr[@]}"; do
       if [ ! "$(docker network ls --filter name=${i} -q)" ]; then
       docker network create --driver overlay --attachable --opt encrypted "${i}"
@@ -107,7 +103,7 @@ function goto_myscript() {
     docker network ls | grep "ntw_" && echo && sleep 2 && \
     clear;
 
-    message_is="Launch stacks" && docker run --rm devmtl/figlet:1.0 ${message_is} && echo && \
+    message_is="Deploy stacks" && docker run --rm devmtl/figlet:1.0 ${message_is} && echo && \
 
     # Set ACME file
     #mkdir -pv           ~/./configs                   && \
@@ -119,8 +115,11 @@ function goto_myscript() {
     #chmod 600 ~/./configs/traefik.yml       && \
 
     # deploy apps
-    docker stack deploy stkproxy -c stk_traefik.yml && \
+    docker stack deploy stksocat -c stk_socat.yml && \
+    docker stack deploy stktraefik -c stk_traefik.yml && \
+    #
     docker stack deploy stkwebapp -c stk_web.yml && \
+    #
     docker stack deploy stkgui -c stk_portainer.yml && echo && \
 
     # deploy swarmpit / constraint the db

traefik_stack6/runup.sh

@@ -0,0 +1,44 @@
+version: '3.7'
+
+x-default-opts:
+  &default-opts
+  logging:
+    options:
+      max-size: "10m"
+
+services:
+
+  # this custom haproxy allows us to move traefik to worker nodes
+  # while this container listens on managers and only allows
+  # traefik to connect, read-only, to limited docker api calls
+  # https://github.com/Tecnativa/docker-socket-proxy
+  proxysocket:
+    <<: *default-opts
+    image: devmtl/proxysocket:1.9.10
+    networks:
+      - ntw_proxy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      NETWORKS: 1
+      SERVICES: 1
+      TASKS: 1
+      # CONTAINERS: 1
+      # SWARM: 1
+    deploy:
+      mode: global
+      placement:
+        constraints: [node.role == manager]
+      restart_policy:
+        condition: on-failure
+      resources:
+        limits:
+          cpus: '0.20'
+          memory: 8M
+        reservations:
+          cpus: '0.10'
+          memory: 4M
+
+networks:
+  ntw_proxy:
+    external: true

traefik_stack6/stk_socat.yml

@@ -1,5 +1,6 @@
 version: '3.7'
 
+# logs config
 x-default-opts:
   &default-opts
   logging:
@@ -59,37 +60,6 @@ services:
         #- "traefik.http.routers.api.rule=PathPrefix(`/traefik`)"
         #- "traefik.http.routers.api.service=api@internal"
 
-  # this custom haproxy allows us to move traefik to worker nodes
-  # while this container listens on managers and only allows
-  # traefik to connect, read-only, to limited docker api calls
-  # https://github.com/Tecnativa/docker-socket-proxy
-  proxysocket:
-    <<: *default-opts
-    image: devmtl/proxysocket:1.9.10
-    networks:
-      - ntw_proxy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      NETWORKS: 1
-      SERVICES: 1
-      TASKS: 1
-      # CONTAINERS: 1
-      # SWARM: 1
-    deploy:
-      mode: global
-      placement:
-        constraints: [node.role == manager]
-      restart_policy:
-        condition: on-failure
-      resources:
-        limits:
-          cpus: '0.20'
-          memory: 8M
-        reservations:
-          cpus: '0.10'
-          memory: 4M
-
 networks:
   ntw_front:
     external: true