From 396a6f0c786c1c264e41d471227577cb5128ddd0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 May 2022 19:24:53 +0300 Subject: [PATCH 1/4] Remove Portainer --- .env | 1 - .github/workflows/tests.yml | 8 ++++---- README.md | 4 +--- docker-compose.yml | 18 ------------------ make/stonehenge.mk | 1 - make/utilities.mk | 5 ----- portainer_admin_password | 1 - 7 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 portainer_admin_password diff --git a/.env b/.env index 3de4f679..16711ab7 100644 --- a/.env +++ b/.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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 21b2bd38..3e02bae4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,11 +36,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 diff --git a/README.md b/README.md index ea7dc70a..668003f8 100644 --- a/README.md +++ b/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 @@ -162,7 +161,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 diff --git a/docker-compose.yml b/docker-compose.yml index ce624f82..dbaf45c5 100644 --- a/docker-compose.yml +++ b/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" diff --git a/make/stonehenge.mk b/make/stonehenge.mk index 41ee3fc5..1d0bc274 100644 --- a/make/stonehenge.mk +++ b/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!) diff --git a/make/utilities.mk b/make/utilities.mk index d6514c9f..dbb204e4 100644 --- a/make/utilities.mk +++ b/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 diff --git a/portainer_admin_password b/portainer_admin_password deleted file mode 100644 index 7fbe952b..00000000 --- a/portainer_admin_password +++ /dev/null @@ -1 +0,0 @@ -admin From c4f068d43e8977dd8d98115caae398712e480da4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 May 2022 19:33:17 +0300 Subject: [PATCH 2/4] Run apt update --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e02bae4..3261f5b2 100644 --- a/.github/workflows/tests.yml +++ b/.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 From ac0d501944675bc21ba6487fce82db75252d6c20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 May 2022 19:42:39 +0300 Subject: [PATCH 3/4] Get the macOS patch version number --- make/os.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/os.mk b/make/os.mk index 1dc1278b..7cd94dff 100644 --- a/make/os.mk +++ b/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) From fafcb97cee4b69414154aaf259393dc2cf482944 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 May 2022 19:45:58 +0300 Subject: [PATCH 4/4] Remove old versions from README.md --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 668003f8..a5fdaf02 100644 --- a/README.md +++ b/README.md @@ -122,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