From c834bc14d5ab11aef4916d5829bb1c1ce828a587 Mon Sep 17 00:00:00 2001 From: konrad Date: Sat, 8 Sep 2018 15:23:53 +0200 Subject: [PATCH] Moved dockerfile --- .drone.yml | 21 +++++++++++---------- Dockerfile | 1 - 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index ba9857c0890..d6080c4e8b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -105,16 +105,6 @@ pipeline: when: event: [tag, push] - docker: - image: plugins/docker - pull: true - secrets: [ docker_username, docker_password ] - repo: vikunja/api - auto_tag: true - when: - event: [ push, tag ] - branch: [ master ] - # Push the releases to our pseudo-s3-bucket release: image: plugins/s3:1 @@ -141,4 +131,15 @@ pipeline: target: /master when: event: [ push ] + branch: [ master ] + +# Build the docker image and push it to docker hub + docker: + image: plugins/docker + pull: true + secrets: [ docker_username, docker_password ] + repo: vikunja/api + auto_tag: true + when: + event: [ push, tag ] branch: [ master ] \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 21556eb35ed..4542cd6e720 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,6 @@ RUN apk --no-cache add \ curl \ gettext \ linux-pam \ - openssh \ s6 \ sqlite \ su-exec \