From 941b642f399121b6eb8058a892c074ea222a136e Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Fri, 11 Feb 2022 23:16:57 +0000
Subject: [PATCH] Build docker within task

---
 .drone.yml        | 36 ++++++++++++++++++------------------
 Taskfile.yml      | 11 ++++++++++-
 docker/Dockerfile |  1 -
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7f6e6f0..ea80847 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,25 +8,25 @@ steps:
   image: hub.javil.eu/budgeteer:dev
   pull: true
   commands:
-    - task
+    - task docker
 
-- name: docker  
-  image: plugins/docker
-  settings:
-    registry: hub.javil.eu
-    username: 
-      from_secret: docker_user
-    password:
-      from_secret: docker_password
-    repo: hub.javil.eu/budgeteer
-    context: build
-    dockerfile: build/Dockerfile
-    tags: 
-      - latest
-  when:
-    event:
-      exclude:
-      - pull_request
+#- name: docker  
+  #image: plugins/docker
+  #settings:
+    #registry: hub.javil.eu
+    #username: 
+      #from_secret: docker_user
+    #password:
+      #from_secret: docker_password
+    #repo: hub.javil.eu/budgeteer
+    #context: build
+    #dockerfile: build/Dockerfile
+    #tags: 
+      #- latest
+  #when:
+    #event:
+      #exclude:
+      #- pull_request
 
 
 image_pull_secrets:
diff --git a/Taskfile.yml b/Taskfile.yml
index ded3bd9..2b2b548 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -73,7 +73,16 @@ tasks:
     sources:
       - ./build/budgeteer{{exeExt}}
     cmds:
-      - docker build -t budgeteer:latest -t hub.javil.eu/budgeteer:latest ./build
+      - docker build -t hub.javil.eu/budgeteer:latest ./build
+      - docker push hub.javil.eu/budgeteer:latest
+
+  dev-docker:
+    desc: Build budgeeter:dev
+    sources:
+      - ./build/budgeteer{{exeExt}}
+    cmds:
+      - docker build -t hub.javil.eu/budgeteer:dev ./docker
+      - docker push hub.javil.eu/budgeteer:dev
 
   run:
     desc: Start budgeteer
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6430a9a..3ce133b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,6 @@
 FROM alpine
 RUN apk add go
 RUN apk add nodejs yarn bash curl git git-perl tmux
-RUN bash -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
 ADD build.sh /
 RUN addgroup -S dev && adduser -S dev -G dev
 USER dev