From 0bd804c45f628f2dd032e1c2cbc86f9b8dbb4f0c Mon Sep 17 00:00:00 2001
From: Henrik Mertens <henrik.metens@bib.de>
Date: Fri, 24 Feb 2023 08:30:00 +0100
Subject: [PATCH] added composer caddy

---
 .gitignore                                |  5 +++
 .gitmodules                               |  3 --
 .woodpecker.yml                           |  4 +-
 Composer/caddy/README.MD                  |  7 ++++
 Composer/caddy/docker-compose.yml         | 29 ++++++++++++++
 Composer/woodpecker/docker-compose.yml    | 48 +++++++++++++++++++++++
 {kontify => Container/kontify}/Dockerfile |  0
 {kontify => Container/kontify}/README.MD  |  0
 {kontify => Container/kontify}/RUN.sh     |  0
 README.md                                 |  4 +-
 kontify/.gitignore                        |  1 -
 11 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .gitmodules
 create mode 100644 Composer/caddy/README.MD
 create mode 100644 Composer/caddy/docker-compose.yml
 create mode 100644 Composer/woodpecker/docker-compose.yml
 rename {kontify => Container/kontify}/Dockerfile (100%)
 rename {kontify => Container/kontify}/README.MD (100%)
 rename {kontify => Container/kontify}/RUN.sh (100%)
 delete mode 100644 kontify/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..546b9f8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+config/
+
+.env
+
+data/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0a8820c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "kontify/kontify"]
-	path = kontify/kontify
-	url = https://github.com/jahir/kontify.git
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 50e19c1..1636ae8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -10,5 +10,5 @@ pipeline:
         from_secret: docker_password
       username:
         from_secret: docker_username
-      dockerfile: ./kontify/Dockerfile
-      context: ./kontify
\ No newline at end of file
+      dockerfile: ./Container/kontify/Dockerfile
+      context: ./Container//kontify
\ No newline at end of file
diff --git a/Composer/caddy/README.MD b/Composer/caddy/README.MD
new file mode 100644
index 0000000..f27c9af
--- /dev/null
+++ b/Composer/caddy/README.MD
@@ -0,0 +1,7 @@
+# Automatischer Caddy Proxy Server
+Dieser Server erstellt automatisch Proxy Regeln für Docker Container. 
+Vor dem Start muss der Befehl
+
+    docker network create caddy 
+    
+ausgeführt werden. 
\ No newline at end of file
diff --git a/Composer/caddy/docker-compose.yml b/Composer/caddy/docker-compose.yml
new file mode 100644
index 0000000..77ebbd5
--- /dev/null
+++ b/Composer/caddy/docker-compose.yml
@@ -0,0 +1,29 @@
+version: "3.7"
+services:
+  caddy:
+    image: lucaslorentz/caddy-docker-proxy
+    ports:
+      - 80:80
+      - 443:443
+    environment:
+      - CADDY_INGRESS_NETWORKS=caddy
+    networks:
+      - caddy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - caddy_data:/data
+    restart: unless-stopped
+  whoami:
+    image: containous/whoami
+    networks:
+      - caddy
+    labels:
+      caddy: whoami.localhost
+      caddy.reverse_proxy: "{{upstreams 80}}"
+
+networks:
+  caddy:
+    external: true
+
+volumes:
+  caddy_data: {}
\ No newline at end of file
diff --git a/Composer/woodpecker/docker-compose.yml b/Composer/woodpecker/docker-compose.yml
new file mode 100644
index 0000000..9944812
--- /dev/null
+++ b/Composer/woodpecker/docker-compose.yml
@@ -0,0 +1,48 @@
+version: '3'
+
+services:
+  woodpecker-server:
+    image: woodpeckerci/woodpecker-server:next
+    #ports:
+    #  - 8000:8000
+    volumes:
+      - woodpecker-server-data:/var/lib/woodpecker/
+    environment:
+      - WOODPECKER_LOG_LEVEL=info
+      - WOODPECKER_OPEN=true
+      - WOODPECKER_HOST=${WOODPECKER_HOST}
+      - WOODPECKER_SECRET=${WOODPECKER_AGENT_SECRET}
+      - WOODPECKER_GITEA=true
+      - WOODPECKER_GITEA_URL=${WOODPECKER_GITEA_URL}
+      - WOODPECKER_GITEA_CLIENT=${WOODPECKER_GITEA_CLIENT}
+      - WOODPECKER_GITEA_SECRET=${WOODPECKER_GITEA_SECRET}
+    networks:
+      - caddy
+      - woodpecker
+    labels:
+      caddy: woodpecker.localhost
+      caddy.reverse_proxy: "{{upstreams 8000}}"
+  woodpecker-agent:
+    image: woodpeckerci/woodpecker-agent:next
+    #command: agent
+    restart: always
+    depends_on:
+      - woodpecker-server
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - woodpecker
+    environment:
+#      - WOODPECKER_LOG_LEVEL=debug
+      - WOODPECKER_SERVER=woodpecker-server:9000
+      - WOODPECKER_SECRET=${WOODPECKER_AGENT_SECRET}
+
+volumes:
+  woodpecker-server-data:
+
+
+networks:
+  woodpecker:
+    internal: true
+  caddy:
+    external: true
\ No newline at end of file
diff --git a/kontify/Dockerfile b/Container/kontify/Dockerfile
similarity index 100%
rename from kontify/Dockerfile
rename to Container/kontify/Dockerfile
diff --git a/kontify/README.MD b/Container/kontify/README.MD
similarity index 100%
rename from kontify/README.MD
rename to Container/kontify/README.MD
diff --git a/kontify/RUN.sh b/Container/kontify/RUN.sh
similarity index 100%
rename from kontify/RUN.sh
rename to Container/kontify/RUN.sh
diff --git a/README.md b/README.md
index 7cd0056..b397d6f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Container
+# Container 
 [![status-badge](http://bodo.mertens.digital/api/badges/heri410/Container/status.svg)](http://bodo.mertens.digital/heri410/Container)
 
-Collection of Containers to Build
\ No newline at end of file
+Collection of Containers and Docker Compose Files
\ No newline at end of file
diff --git a/kontify/.gitignore b/kontify/.gitignore
deleted file mode 100644
index 2ec5195..0000000
--- a/kontify/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config/
\ No newline at end of file