Merge pull request #66 from druidfi/remove-portainer

Remove Portainer

.env

@@ -15,5 +15,4 @@ STONEHENGE_VERSION=3
 
 # Image versions
 TRAEFIK_VERSION=2.6.3
-PORTAINER_VERSION=2.11.1
 SSH_IMAGE_VERSION=alpine-3.15.4

.github/workflows/tests.yml

@@ -22,6 +22,9 @@ jobs:
         with:
           fetch-depth: 1
 
+      - name: Apt update
+        run: sudo apt update --yes
+
       - name: Show debug info
         run: |
           make debug
@@ -36,11 +39,11 @@ jobs:
       - name: Check that DNS works when curling Google. Expecting HTTP/2 200
         run: curl -Is https://www.google.com | head -1
 
-      - name: Check if Portainer can be accessed from portainer.docker.so
+      - name: Check if Traefik can be accessed from traefik.docker.so
         run: |
-          printf "CURL portainer.docker.so for checking access starts"
-          until curl -s "https://portainer.docker.so" | grep Portainer; do true; done > /dev/null
-          printf "CURL portainer.docker.so for checking access ends"
+          printf "CURL traefik.docker.so for checking access starts"
+          until curl -s "https://traefik.docker.so" | grep /dashboard/; do true; done > /dev/null
+          printf "CURL traefik.docker.so for checking access ends"
 
       - name: Tear down Stonehenge
         run: make down

README.md

@@ -18,7 +18,7 @@ domains for your projects as well as SSL certificates for those domains out of t
 
 - Latest macOS, Ubuntu LTS or Windows 10/11 + WSL2 - [Read more](#supported-operating-systems)
 - Make
-- Docker 18.06.0+
+- Docker 20+
 - Docker Compose
 - No other services listening port 80 or 443
 
@@ -29,7 +29,6 @@ domains for your projects as well as SSL certificates for those domains out of t
 ## Stonehenge building blocks
 
 - [Traefik](https://traefik.io/traefik/) in [traefik.docker.so](https://traefik.docker.so) to handle all traffic to containers
-- [Portainer](https://www.portainer.io/) in [portainer.docker.so](https://portainer.docker.so) to manage your Docker (username: `admin`, password: `admin`)
 - [mkcert](https://github.com/FiloSottile/mkcert) generated wildcard SSL certificate
 - [druidfi/ssh-agent](https://hub.docker.com/r/druidfi/ssh-agent) for handling SSH keys
 - [MailHog](https://github.com/mailhog/MailHog) in [mailhog.docker.so](https://mailhog.docker.so) to catch emails
@@ -123,13 +122,6 @@ make addkey KEY=/path/to/mykey
 Also tested with at some point:
 
 - Arch Linux
-- macOS High Sierra 10.13
-- macOS Mojave 10.14
-- macOS Catalina 10.15
-- Manjaro 17.1 (Arch Linux)
-- Manjaro 18.1 (Arch Linux)
-- Ubuntu 16.04 LTS
-- Ubuntu 18.04 LTS
 
 ## Fork and modify
 
@@ -162,7 +154,6 @@ make debug
 
 - [https://github.com/mailhog/MailHog](https://github.com/mailhog/MailHog)
 - [https://github.com/FiloSottile/mkcert](https://github.com/FiloSottile/mkcert)
-- [https://portainer.io/](https://portainer.io/)
 - [https://traefik.io/](https://traefik.io/)
 
 ## License

docker-compose.yml

@@ -34,24 +34,6 @@ services:
       - ./traefik/traefik.dynamic.yml:/configuration/traefik.dynamic.yml
       - ./certs:/ssl # mkcert certs
 
-  portainer:
-    image: "portainer/portainer-ce:${PORTAINER_VERSION}-alpine"
-    container_name: "${PREFIX}-portainer"
-    restart: unless-stopped
-    command: |-
-      -H unix:///var/run/docker.sock
-      --logo "${LOGO_URL}"
-      --admin-password-file /tmp/portainer_password
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./portainer_admin_password:/tmp/portainer_password
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.portainer.entrypoints: https
-      traefik.http.routers.portainer.rule: Host(`portainer.${DOCKER_DOMAIN}`)
-      traefik.http.routers.portainer.tls: "true"
-      traefik.http.services.portainer.loadbalancer.server.port: 9000
-
   mailhog:
     image: druidfi/mailhog:1.0.1
     container_name: "${PREFIX}-mailhog"

make/os.mk

@@ -10,7 +10,7 @@ UNAME := $(shell uname | tr A-Z a-z)
 ifeq ($(UNAME),darwin)
 	OS_ID := macos
 	OS_VERSION_MAJOR := $(shell sw_vers -productVersion | cut -c1-2)
-	OS_VERSION := $(shell sw_vers -productVersion | cut -c1-5)
+	OS_VERSION := $(shell sw_vers -productVersion | cut -c1-6)
 ifeq ($(OS_VERSION_MAJOR),12)
 	OS := macOS Monterey
 else ifeq ($(OS_VERSION_MAJOR),11)

make/stonehenge.mk

@@ -67,7 +67,6 @@ PHONY += --up-post-actions
 --up-post-actions: $(UP_POST_TARGETS)
 	$(call step,You can now access Stonehenge services with these URLs:)
 	$(call item,- https://traefik.${DOCKER_DOMAIN})
-	$(call item,- https://portainer.${DOCKER_DOMAIN})
 	$(call item,- https://mailhog.${DOCKER_DOMAIN})
 	$(call success,SUCCESS! Happy Developing!)
 

make/utilities.mk

@@ -36,11 +36,6 @@ ping: ## Ping docker.so domain
 	$(call step,Domain foobar.$(DOCKER_DOMAIN) resolves to:)
 	@ping -q -c 1 -t 1 foobar.$(DOCKER_DOMAIN) | grep PING | sed -e "s/).*//" | sed -e "s/.*(//"
 
-PHONY += url
-url: SERVICE := portainer
-url:
-	@echo $(SERVICE).$(DOCKER_DOMAIN)
-
 PHONY += debug-arch
 debug-arch:
 	@make debug OS_RELEASE_FILE=tests/os-release.arch UNAME=Linux