From 4745d5f3da32019a458f332f04f95fa0bd97e121 Mon Sep 17 00:00:00 2001
From: matthias <matthias+code@mailbro.de>
Date: Sat, 29 Oct 2022 00:09:16 +0200
Subject: [PATCH] add docker-compose file for production

---
 .drone.yml               | 20 ++++++++++++++++++--
 docker-compose.stage.yml | 24 ------------------------
 docker-compose.yml       | 27 +++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 26 deletions(-)
 delete mode 100644 docker-compose.stage.yml
 create mode 100644 docker-compose.yml

diff --git a/.drone.yml b/.drone.yml
index 99fddd8..8e57699 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,7 +13,7 @@ steps:
     repo: codeberg.org/angestoepselt/homepage
     build_args:
     - SITE=angestoepselt
-    tags: latest
+    tags: [ latest, ${DRONE_BRANCH} ]
 
 - name: deploy stage build
   image: plugins/webhook
@@ -29,4 +29,20 @@ steps:
     urls:
       from_secret: portainer_main_url
     when:
-      branch: [main]
\ No newline at end of file
+      branch: [main]
+
+- name: send notification
+  image: plugins/webhook
+  settings:
+    username: drone_webhook
+    password:
+      from_secret: webhook_password
+    urls:
+      from_secret: webhook_notify_url
+    content_type: application/json
+    template: |
+      {
+        "owner": "{{ repo.owner }}",
+        "repo": "{{ repo.name }}",
+        "status": "{{ build.status }}",
+      }
\ No newline at end of file
diff --git a/docker-compose.stage.yml b/docker-compose.stage.yml
deleted file mode 100644
index b7146af..0000000
--- a/docker-compose.stage.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-version: '3'
-
-services:
-  homepage-stage:
-    image: codeberg.org/angestoepselt/homepage:captcha
-    container_name: homepage-stage
-    restart: unless-stopped
-    env_file: stack.env
-    security_opt:
-      - no-new-privileges:true
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=proxy"
-      - "traefik.http.routers.homepage-stage-secure.rule=Host(`${DOMAIN}`)"
-      - "traefik.http.routers.homepage-stage-secure.entrypoints=websecure"
-      - "traefik.http.routers.homepage-stage-secure.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.homepage-stage-secure.tls=true"
-    networks:
-      - proxy
-
-networks:
-  proxy:
-    external: true
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0f440c4
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,27 @@
+---
+version: '3'
+
+services:
+  homepage:
+    image: codeberg.org/angestoepselt/homepage:${BRANCH:-main}
+    container_name: homepage-${BRANCH:-main}
+    restart: unless-stopped
+    env_file: stack.env
+    security_opt:
+      - no-new-privileges:true
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.routers.homepage-${BRANCH:-main}-secure.rule=Host(`${DOMAIN}`,`www.${DOMAIN}`)"
+      - "traefik.http.routers.homepage-${BRANCH:-main}-secure.entrypoints=websecure"
+      - "traefik.http.routers.homepage-${BRANCH:-main}-secure.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.homepage-${BRANCH:-main}-secure.tls=true"
+      - "traefik.http.routers.homepage-${BRANCH:-main}-secure.middlewares=www-redirectregex"
+      - "traefik.http.middlewares.www-redirectregex.redirectregex.regex=^https?://www.${DOMAIN}"
+      - "traefik.http.middlewares.www-redirectregex.redirectregex.replacement=https://${DOMAIN}"
+    networks:
+      - proxy
+
+networks:
+  proxy:
+    external: true
\ No newline at end of file