From beb81d05bee09ee5cd0e3a6cf0a5150ad1041198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= <huebner@jan-ole.de>
Date: Sat, 2 Sep 2023 18:38:59 +0200
Subject: [PATCH 1/4] creating Pipeline

---
 .github/workflows/docker.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a1de817..2d49002 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,10 +12,11 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to Docker Hub
-        run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+        run: echo ${{ secrets.DOCKER_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+
 
       - name: Build and push Docker image
         env:

From 3a27e5449d467042186f6af7e4f4a62c963b776c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= <huebner@jan-ole.de>
Date: Sat, 2 Sep 2023 18:47:09 +0200
Subject: [PATCH 2/4] creating Pipeline

---
 .github/workflows/docker.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2d49002..ec5bd69 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,6 +7,17 @@ on:
       - dev
 
 jobs:
+
+  login:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
   build-and-push:
     runs-on: ubuntu-latest
 
@@ -14,13 +25,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Login to Docker Hub
-        run: echo ${{ secrets.DOCKER_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-
-
       - name: Build and push Docker image
         env:
-          DOCKER_IMAGE_NAME: your-docker-image-name
+          DOCKER_IMAGE_NAME: tibber-influx
         run: |
           if [ "${{ github.ref }}" == "refs/heads/main" ]; then
             DOCKER_TAG="latest"
@@ -29,7 +36,7 @@ jobs:
           else
             DOCKER_TAG="other"
           fi
-          
+
           docker build -t $DOCKER_IMAGE_NAME .
-          docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
+          docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
+          docker push ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG

From 13f5330c73938b6d2eb3f61e085509865ee8f729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= <huebner@jan-ole.de>
Date: Sat, 2 Sep 2023 18:58:17 +0200
Subject: [PATCH 3/4] creating Pipeline

---
 .github/workflows/docker.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ec5bd69..6945ba8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,16 +8,6 @@ on:
 
 jobs:
 
-  login:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
   build-and-push:
     runs-on: ubuntu-latest
 
@@ -36,7 +26,7 @@ jobs:
           else
             DOCKER_TAG="other"
           fi
-
+          docker login --username ${{ secrets.DOCKER_USER }} ${{ secrets.DOCKER_TOKEN }}
           docker build -t $DOCKER_IMAGE_NAME .
           docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
           docker push ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG

From 1e746e7b8d7c8eed8886d57e14b0d4a079772663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= <huebner@jan-ole.de>
Date: Sat, 2 Sep 2023 19:04:26 +0200
Subject: [PATCH 4/4] creating Pipeline

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6945ba8..edf48ff 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,7 +26,7 @@ jobs:
           else
             DOCKER_TAG="other"
           fi
-          docker login --username ${{ secrets.DOCKER_USER }} ${{ secrets.DOCKER_TOKEN }}
+          echo ${{ secrets.DOCKER_TOKEN }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
           docker build -t $DOCKER_IMAGE_NAME .
           docker tag $DOCKER_IMAGE_NAME:latest ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG
           docker push ${{ secrets.DOCKER_USER }}/$DOCKER_IMAGE_NAME:$DOCKER_TAG