fix conflicts

.drone.yml

@@ -0,0 +1,68 @@
+---
+kind: pipeline
+type: docker
+name: build-test-deploy
+image_pull_secrets:
+  - registryLogins
+
+platform:
+  os: linux
+  arch: amd64
+
+volumes:
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock
+
+steps:
+  - name: notify_start
+    image: plugins/slack
+    settings:
+      webhook: https://team.wizewerx.tech/hooks/5eq841fropn3prt4kzgoaoprgr
+      channel: git_builds
+      template: >
+        {{uppercase repo.name}}:{{uppercase build.branch}}:{{build.number}} CI build started
+
+  - name: build_and_test
+    image: registry.wizewerx.tech/base/wizewerx-docker-compose
+    volumes:
+      - name: dockersock
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_AUTH_CONFIG:
+        from_secret: registryLogins
+    commands:
+      - mkdir -p "/root/.docker" && echo $DOCKER_AUTH_CONFIG > "/root/.docker/config.json"
+      - export TEST_IMAGE_NAME=${DRONE_REPO_NAME}_app
+      - docker-compose -f ./docker/docker-compose-testing.yml -p ${DRONE_REPO_NAME} up --build --exit-code-from app && echo 'success'
+  - name: deploy
+    image: registry.wizewerx.tech/base/wizewerx-docker-compose
+    volumes:
+      - name: dockersock
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_AUTH_CONFIG:
+        from_secret: registryLogins
+    commands:
+      - mkdir -p "/root/.docker" && echo $DOCKER_AUTH_CONFIG > "/root/.docker/config.json"
+      - export TEST_IMAGE_NAME=${DRONE_REPO_NAME}_app
+      - export BUILD_TARGET=registry.wizewerx.tech/tools/${DRONE_REPO_NAME}:${DRONE_COMMIT_BRANCH}
+      - docker tag $TEST_IMAGE_NAME $BUILD_TARGET
+      - docker push $BUILD_TARGET
+    trigger:
+      branch:
+        - master
+  - name: notify_end
+    image: plugins/slack
+    settings:
+      webhook: https://team.wizewerx.tech/hooks/5eq841fropn3prt4kzgoaoprgr
+      channel: git_builds
+      username: mike
+      template: >
+        {{uppercase repo.name}}:{{uppercase build.branch}}:{{build.number}}{{#success build.status}} succeeded. Good job. {{else}} failed. FIX THE BUILD!!!.{{/success}}
+        Build took {{since build.started}}
+    when:
+      status: [ success, failure ]
+    trigger:
+      branch:
+        - master

Dockerfile

@@ -0,0 +1,3 @@
+FROM caddy:2
+COPY /public /usr/share/caddy/
+#APP=kc_themes && TARGET=master && docker build -f ./Dockerfile -t registry.wizewerx.tech/tools/$APP:$TARGET . && docker push registry.wizewerx.tech/tools/$APP:$TARGET

docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3.3'
+services:
+  app:
+    image: registry.wizewerx.tech/tools/kc_themes:master
+    networks:
+      - routable
+    logging:
+      driver: json-file
+    deploy:
+      labels:
+        caddy: themes.wizewerx.tech
+        caddy.reverse_proxy: '{{upstreams 80}}'
+networks:
+  routable:
+    external: true
+