From 17dee3af9085dce48cde46afa0978ab57217d544 Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Mon, 26 Dec 2022 09:31:35 +0100
Subject: [PATCH] Use secrets and configs

---
 bootstrap.docker-compose.yaml                 | 19 +++++++++++++------
 mounts/.gitignore                             |  4 ++++
 mounts/portainer/data/README.md               |  0
 mounts/portainer/secrets/README.md            |  2 ++
 .../traefik/config}/traefik.yaml              |  3 +++
 volumes/portainer/.gitignore                  |  1 -
 volumes/portainer/portainer_password          |  1 -
 7 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 mounts/.gitignore
 create mode 100644 mounts/portainer/data/README.md
 create mode 100644 mounts/portainer/secrets/README.md
 rename {volumes/traefik => mounts/traefik/config}/traefik.yaml (81%)
 delete mode 100644 volumes/portainer/.gitignore
 delete mode 100644 volumes/portainer/portainer_password

diff --git a/bootstrap.docker-compose.yaml b/bootstrap.docker-compose.yaml
index ba4f087..09409d3 100644
--- a/bootstrap.docker-compose.yaml
+++ b/bootstrap.docker-compose.yaml
@@ -21,8 +21,9 @@ services:
     networks:
       - traefik
       - docker
-    volumes:
-      - traefik:/etc/traefik/
+    configs:
+      - source: traefik
+        target: /etc/traefik/
     depends_on:
       - docker
     restart: unless-stopped
@@ -40,6 +41,8 @@ services:
       - traefik
     volumes:
       - portainer:/data
+    secrets:
+      - portainer_password
     depends_on:
       - docker
     restart: unless-stopped
@@ -67,8 +70,12 @@ volumes:
   portainer:
     driver_opts:
       <<: *bind-volume
-      device: ${MOUNT_DIR?}/portainer/
+      device: ${MOUNT_DIR?}/portainer/data/
+
+config:
   traefik:
-    driver_opts:
-      <<: *bind-volume
-      device: ${MOUNT_DIR?}/traefik/
+    file: ${MOUNT_DIR?}/traefik/config/
+
+secrets:
+  portainer_password:
+    file: ${MOUNT_DIR?}/portainer/secrets/portainer_password
\ No newline at end of file
diff --git a/mounts/.gitignore b/mounts/.gitignore
new file mode 100644
index 0000000..0a442f6
--- /dev/null
+++ b/mounts/.gitignore
@@ -0,0 +1,4 @@
+*/data/*
+!*/data/README.md
+*/secrets/*
+!*/secrets/README.md
\ No newline at end of file
diff --git a/mounts/portainer/data/README.md b/mounts/portainer/data/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/mounts/portainer/secrets/README.md b/mounts/portainer/secrets/README.md
new file mode 100644
index 0000000..590719b
--- /dev/null
+++ b/mounts/portainer/secrets/README.md
@@ -0,0 +1,2 @@
+Contains the file `portainer_password`
+More on https://docs.portainer.io/advanced/cli#method-2-creating-the-account-using-a-file
\ No newline at end of file
diff --git a/volumes/traefik/traefik.yaml b/mounts/traefik/config/traefik.yaml
similarity index 81%
rename from volumes/traefik/traefik.yaml
rename to mounts/traefik/config/traefik.yaml
index 5de2545..38de8d2 100644
--- a/volumes/traefik/traefik.yaml
+++ b/mounts/traefik/config/traefik.yaml
@@ -3,3 +3,6 @@ providers:
     endpoint: tcp://docker:2375
     exposedByDefault: false
     network: traefik
+
+api:
+  insecure: true
diff --git a/volumes/portainer/.gitignore b/volumes/portainer/.gitignore
deleted file mode 100644
index 4e68ef4..0000000
--- a/volumes/portainer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-./portainer_password
diff --git a/volumes/portainer/portainer_password b/volumes/portainer/portainer_password
deleted file mode 100644
index f77b004..0000000
--- a/volumes/portainer/portainer_password
+++ /dev/null
@@ -1 +0,0 @@
-admin
\ No newline at end of file