feat!: bump major version

lotyp · lotyp · commit 1dd8255cd45b · 2024-05-31T14:18:01.000+03:00
Preparing for stable release

ci: add healthchecks for traefik, dnsmasq and portrainer

ci: fixes in Makefile
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,15 +24,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os:
+          - ubuntu-latest
     steps:
       - name: 📦 Install goss
         uses: e1himself/goss-installation-action@v1.2.1
 
       - name: 📦 Check out the codebase
         uses: actions/checkout@v4.1.6
-        with:
-          fetch-depth: 0
 
       ### For Cross Platform OSX builds uncomment these lines
       - name: 🖥️ Set up QEMU
@@ -45,7 +44,10 @@ jobs:
         with:
           install: true
 
-      - name: 🧪 Run dcgoss tests
-        run: make test
+      - name: 🌎 Generate .env file
+        run: make env
+
+      - name: 🐳 Start Docker Compose services
+        run: make up
 
 ...
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ BUILDER_PARAMS ?= $(DOCKER) run --rm -i \
 	--env SHARED_DOMAIN_SEGMENT="$(SHARED_DOMAIN_SEGMENT)"
 
 BUILDER ?= $(BUILDER_PARAMS) $(SUPPORT_IMAGE)
-BUILDER_WIRED ?= $(BUILDER_PARAMS) --network project.$(COMPOSE_PROJECT_NAME) $(SUPPORT_IMAGE)
+BUILDER_WIRED ?= $(BUILDER_PARAMS) --network network.$(COMPOSE_PROJECT_NAME) $(SUPPORT_IMAGE)
 
 # Shorthand envsubst command, executed through build-deps
 ENVSUBST ?= $(BUILDER) envsubst
@@ -133,7 +133,7 @@ cert-install: ## Run mkcert to install CA into system storage and generate defau
 # Docker Actions
 # ------------------------------------------------------------------------------------
 up: ## Fire up project
-	$(DOCKER_COMPOSE) up --remove-orphans -d
+	$(DOCKER_COMPOSE) up --remove-orphans -d --wait
 .PHONY: up
 
 down: ## Stops and destroys running containers
@@ -160,10 +160,13 @@ pull: ## Pull upstream images, specified in docker-compose.yml file
 .PHONY: pull
 
 clean:
-	# $(DOCKER_COMPOSE) down -v
 	$(DOCKER_COMPOSE) rm --force --stop
 .PHONY: clean
 
+prune: ## Stops and removes all containers and volumes
+	$(DOCKER_COMPOSE) down --remove-orphans --volumes
+.PHONY: prune
+
 #
 # Code Quality, Git, Linting
 # ------------------------------------------------------------------------------------
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,15 +1,13 @@
 ---
 
-version: '3.9'
-
 services:
   router:
     image: traefik:v3.0.1
     container_name: router
     restart: on-failure
     ports:
-      - "80:80"
-      - "443:443"
+      - '80:80'
+      - '443:443'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./traefik/conf/traefik.yml:/etc/traefik/traefik.yml
@@ -21,29 +19,35 @@ services:
       - traefik.http.routers.router.entrypoints=websecure
       - traefik.http.services.router.loadbalancer.server.port=8080
       - traefik.http.routers.router.tls=true
+    healthcheck:
+      test: ['CMD-SHELL', 'traefik healthcheck --ping']
+      interval: 4s
+      timeout: 4s
+      retries: 8
+      start_period: 4s
 
   ui:
     image: portainer/portainer-ce:2.20.3-alpine
     container_name: ui
     restart: on-failure
     ports:
-      - "9000"
+      - '9000'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ui_data:/data
-    command: "-H unix:///var/run/docker.sock"
+    command: '-H unix:///var/run/docker.sock'
     labels:
       - traefik.enable=true
       - traefik.http.routers.ui.rule=Host(`ui${SHARED_DOMAIN_SEGMENT}.docker`)
       - traefik.http.routers.ui.entrypoints=websecure
       - traefik.http.services.ui.loadbalancer.server.port=9000
       - traefik.http.routers.ui.tls=true
     healthcheck:
-      test: "wget --no-verbose --tries=1 --spider --no-check-certificate http://localhost:9000 || exit 1"
-      interval: 60s
-      timeout: 5s
-      retries: 3
-      start_period: 20s
+      test: 'wget -q --no-verbose --tries=3 --spider --no-check-certificate http://127.0.0.1:9000/api/system/status || exit 1'
+      interval: 4s
+      timeout: 4s
+      retries: 8
+      start_period: 4s
 
   dns:
     image: drpsychick/dnsmasq:latest
@@ -52,17 +56,23 @@ services:
     env_file:
       - .env
     ports:
-      - "53:53/tcp"
-      - "53:53/udp"
+      - '53:53/tcp'
+      - '53:53/udp'
     cap_add:
       - NET_ADMIN
+    healthcheck:
+      test: ['CMD-SHELL', 'nslookup localhost 127.0.0.1 || exit 1']
+      interval: 4s
+      timeout: 4s
+      retries: 8
+      start_period: 4s
 
 networks:
   default:
     name: network.${COMPOSE_PROJECT_NAME}
     ipam:
       config:
-        - subnet: 172.100.61.1/24
+        - subnet: 172.100.61.0/24
 
 volumes:
   ui_data:
diff --git a/traefik/conf/traefik.yml b/traefik/conf/traefik.yml
@@ -39,4 +39,7 @@ tls:
         certFile: /etc/traefik/cert.pem
         keyFile: /etc/traefik/key.pem
 
+ping:
+  entryPoint: 'web'
+
 ...
