From 1b7cc1ea50bc473b2f8f221fd955759440e4a70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Ravent=C3=B3s=20Calle?=
 <31952499+RCRoger@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:08:34 +0100
Subject: [PATCH 1/4] Delete .github/workflows directory

---
 .github/workflows/build-code.yml   | 39 -----------------------
 .github/workflows/docker-image.yml | 50 ------------------------------
 2 files changed, 89 deletions(-)
 delete mode 100644 .github/workflows/build-code.yml
 delete mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/build-code.yml b/.github/workflows/build-code.yml
deleted file mode 100644
index e1f994749..000000000
--- a/.github/workflows/build-code.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Build code
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node_version:
-          - 18
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node_version }}
-          cache: 'yarn'
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Check formatting
-        run: yarn format:check
-
-      - name: Execute tests
-        run: yarn test
-
-      - name: Build application
-        run: yarn build:production
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
deleted file mode 100644
index 47943977f..000000000
--- a/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Docker image CD
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  build_and_push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ghostfolio/ghostfolio
-          tags: |
-            type=semver,pattern={{major}}
-            type=semver,pattern={{version}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.output.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

From 80d825c28b9fd518bf1a0c3d123a7bb41fd3bf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Ravent=C3=B3s=20Calle?=
 <31952499+RCRoger@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:08:57 +0100
Subject: [PATCH 2/4] Create docker-image.yml

---
 .github/workflows/docker-image.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 000000000..d131eac58
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "development" ]
+  pull_request:
+    branches: [ "development" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag roger-ghostfolio:$(date +%s)

From 8980b3dab876496e00312473cfa48df945cc1d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Ravent=C3=B3s=20Calle?=
 <31952499+RCRoger@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:20:24 +0100
Subject: [PATCH 3/4] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 39 ++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d131eac58..4392a29aa 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,18 +1,37 @@
-name: Docker Image CI
+name: Build and Push Docker Image
 
 on:
   push:
-    branches: [ "development" ]
-  pull_request:
-    branches: [ "development" ]
+    branches:
+      - development
+      - master
 
 jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Check Out Repository
+        uses: actions/checkout@v2
 
-  build:
+      - name: Build Project
+        run: |
+          npm install
+          npm run build
 
-    runs-on: ubuntu-latest
+      - name: Log in to GitHub Container Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag roger-ghostfolio:$(date +%s)
+      - name: Build Docker image
+        run: |
+          REPO_LOWER=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
+          BRANCH_NAME=$(echo ${{ github.ref_name }} | tr '[:upper:]' '[:lower:]') # Get the branch name in lowercase
+          docker build . -t ghcr.io/$REPO_LOWER/portfolio:$BRANCH_NAME
+
+      - name: Push Docker image to GitHub Packages
+        run: |
+          REPO_LOWER=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
+          BRANCH_NAME=$(echo ${{ github.ref_name }} | tr '[:upper:]' '[:lower:]') # Get the branch name in lowercase
+          docker push ghcr.io/$REPO_LOWER/$REPO_LOWER:$BRANCH_NAME

From f9cedff20ab3dfe5849752d4a51791d7f33b0ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Ravent=C3=B3s=20Calle?=
 <31952499+RCRoger@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:22:35 +0100
Subject: [PATCH 4/4] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 4392a29aa..29f768a6b 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -16,11 +16,6 @@ jobs:
       - name: Check Out Repository
         uses: actions/checkout@v2
 
-      - name: Build Project
-        run: |
-          npm install
-          npm run build
-
       - name: Log in to GitHub Container Registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
@@ -28,7 +23,7 @@ jobs:
         run: |
           REPO_LOWER=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
           BRANCH_NAME=$(echo ${{ github.ref_name }} | tr '[:upper:]' '[:lower:]') # Get the branch name in lowercase
-          docker build . -t ghcr.io/$REPO_LOWER/portfolio:$BRANCH_NAME
+          docker build . --env-file=.env -t ghcr.io/$REPO_LOWER/$REPO_LOWER:$BRANCH_NAME
 
       - name: Push Docker image to GitHub Packages
         run: |