.dockerignore

@@ -1,2 +0,0 @@
-.drone.yml
-.git

.drone.yml

@@ -3,33 +3,24 @@ kind: pipeline
 type: docker
 name: default
 
+environment:
+  DOCKER_REPO: glenux/service-ntfy
 
 steps:
-  - name: debug
-    image: alpine
-    environment:
-
-    commands:
-      - 'echo "Repository: glenux/service-ntfy"'
-      - 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
-
   - name: publish:commit_sha
     image: plugins/docker
     # pull: never
     # volumes:
     #   - name: cache
     #     path: /stupid
-    environment:
-      DOCKER_REPO: glenux/service-ntfy
     settings:
       username:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
       cache_from: "${DOCKER_REPO}:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-ntfy
+      repo: "${DOCKER_REPO}"
       tags: "${DRONE_COMMIT_SHA:0:8}"
-      purge: false
 
   - name: publish:commit_branch
     image: plugins/docker
@@ -41,59 +32,27 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-ntfy:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "${DOCKER_REPO}:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-ntfy
+      repo: "${DOCKER_REPO}"
       tags: "latest_${DRONE_BRANCH/\\//-}"
-      purge: false
     when:
       branch:
         - "master"
         - "develop"
         - "feature/*"
 
-  - name: publish:latest
+  - name: docker
     image: plugins/docker
     settings:
-      username:
+      username: "${DOCKERHUB_USERNAME}"
-        from_secret: DOCKERHUB_USERNAME
+      password: "${DOCKERHUB_PASSWORD}"
-      password:
+      cache_from: "${DOCKER_REPO}:latest_${DRONE_BRANCH/\\//-}"
-        from_secret: DOCKERHUB_PASSWORD
+      repo: "${DOCKER_REPO}"
-      cache_from: "glenux/service-ntfy:latest_${DRONE_BRANCH/\\//-}"
-      repo: glenux/service-ntfy
       tags: latest
-      purge: false
     when:
       branch:
         - master
 
-  - name: deploy:dokku
-    image: alpine
-    when:
-      branch:
-        - master
-    environment:
-      SSH_USER:
-        from_secret: SSH_USER
-      SSH_HOST:
-        from_secret: SSH_HOST
-      SSH_PRIVATE_KEY:
-        from_secret: SSH_PRIVATE_KEY
-    commands:
-      - echo $SSH_USER
-      - echo $SSH_HOST
-      - echo $SSH_PRIVATE_KEY
-      - apk update && apk add openssh-client
-      - mkdir -p ~/.ssh && chmod 700 ~/.ssh
-      - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/deploy_key
-      - chmod 600 ~/.ssh/deploy_key
-      - ssh -o StrictHostKeyChecking=no
-            -i ~/.ssh/deploy_key
-            "$SSH_USER@$SSH_HOST"
-            git:from-image notify
-            "glenux/service-ntfy:${DRONE_COMMIT_SHA:0:8}"
-            #
-
-
 # volumes:
 #   - name: cache
 #     temp: {}

Dockerfile

@@ -1,9 +1,3 @@
-FROM binwiederhier/ntfy:v2.0.1
+FROM binwiederhier/ntfy
-
-# AS builder
-# FROM scratch AS runtime
-# COPY --from=builder /usr/bin/ntfy /usr/bin/ntfy
-
 COPY server.yml /etc/ntfy/server.yml
 ENTRYPOINT ["ntfy", "serve"]
-CMD []