CI. Fuck.

2 files changed, 42 insertions, 9 deletions

diff --git a/playbooks/roles/src/templates/stacks/docker-compose.yml b/playbooks/roles/src/templates/stacks/docker-compose.yml
index 3ac70f9..ec514b4 100644
--- a/playbooks/roles/src/templates/stacks/docker-compose.yml
+++ b/playbooks/roles/src/templates/stacks/docker-compose.yml
@@ -1,5 +1,37 @@
 services:
-  # TODO: own cgit fork
+  frontend:
+    image: oci.liz.coffee/emprespresso/cgit:release
+    volumes:
+      - {{ src_base }}/volumes/data/repos:/srv/git:ro
+    environment:
+      CGIT_TITLE: '{{ src_domain }}'
+      CGIT_DESC: '<3 {{ domain }}'
+      CGIT_VROOT: '/cgit'
+      CGIT_SECTION_FROM_STARTPATH: 1
+      CGIT_MAX_REPO_COUNT: 100
+    networks:
+      - proxy
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost"]
+      timeout: 15s
+      interval: 30s
+      retries: 3
+      start_period: 5s
+    deploy:
+      mode: replicated
+      update_config:
+        parallelism: 1
+        failure_action: rollback
+        order: start-first
+        monitor: 10s
+      labels:
+        - traefik.enable=true
+        - traefik.swarm.network=proxy
+        - traefik.http.routers.src.tls=true
+        - traefik.http.routers.src.tls.certResolver=letsencrypt
+        - traefik.http.routers.src.rule=Host(`{{ src_domain }}`)
+        - traefik.http.routers.src.entrypoints=websecure
+        - traefik.http.services.src.loadbalancer.server.port=80
 
   src:
     image: charmcli/soft-serve
diff --git a/playbooks/roles/src/templates/volumes/soft-serve/hooks/update b/playbooks/roles/src/templates/volumes/soft-serve/hooks/update
index a97e5f9..c209b41 100755
--- a/playbooks/roles/src/templates/volumes/soft-serve/hooks/update
+++ b/playbooks/roles/src/templates/volumes/soft-serve/hooks/update
@@ -41,22 +41,23 @@ refname="$1"
 _oldrev="$2"
 rev="$3"
 
-function post_trigger_ci_jobs() {
-    local host="cihooks"
+post_trigger_ci_jobs() {
+    local host="ci_server"
     local port="9000"
     local path="/job"
     local json_payload=$(printf '{"type": "ci_pipeline", "arguments": {"remote": "%s", "rev": "%s", "refname": "%s"}}' "$1" "$2" "$3")
-  
+
     echo "> $json_payload"
-  
-    which curl 2&>/dev/null || apk add -q curl
 
-    curl --silent --show-error -X POST \
-         -H "Content-Type: application/json" \ -H "Connection: close" \
+    which curl 2&>/dev/null || apk add -q curl
+    curl -X POST \
+         -H "Content-Type: application/json" \
+         -H "Connection: close" \
          -d "$json_payload" \
+         --no-progress-meter \
          "http://$host:$port$path"
 
-    echo "... Done!"
+    echo "... Done"
 }
 # -- </continuous_integration> --