From babd98b958d634e5089edb4b942c507607313b54 Mon Sep 17 00:00:00 2001
From: Patrik Kernstock <patrik@kernstock.net>
Date: Sat, 24 Feb 2024 05:00:42 +0100
Subject: [PATCH] Split RUN commands, fix/updated GH Action

---
 .github/workflows/build-parsedmarc-init.yml | 16 ++++++++++------
 data/Dockerfiles/parsedmarc/Dockerfile      |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-parsedmarc-init.yml b/.github/workflows/build-parsedmarc-init.yml
index ab2f5a9..28dd9dd 100644
--- a/.github/workflows/build-parsedmarc-init.yml
+++ b/.github/workflows/build-parsedmarc-init.yml
@@ -12,12 +12,16 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          path: data/Dockerfiles/parsedmarc-init/
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: patschi/parsedmarc
-          tags: init
-          add_git_labels: true
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: data/Dockerfiles/parsedmarc-init/
+          tags: patschi/parsedmarc:init
+          push: true
diff --git a/data/Dockerfiles/parsedmarc/Dockerfile b/data/Dockerfiles/parsedmarc/Dockerfile
index c227c86..7824772 100644
--- a/data/Dockerfiles/parsedmarc/Dockerfile
+++ b/data/Dockerfiles/parsedmarc/Dockerfile
@@ -5,9 +5,9 @@ RUN apt-get update \
     && apt-get install -y \
         python3-pip python3-dev libxml2-dev libxslt-dev libz-dev libxml2-dev \
         gcc libemail-outlook-message-perl python3-gi python3-gi-cairo \
-        gir1.2-secret-1 \
-    && pip install -U parsedmarc \
-    && apt-get purge --yes gcc && apt autoremove --yes && apt-get clean \
+        gir1.2-secret-1
+RUN pip install -U parsedmarc
+RUN apt-get purge --yes gcc && apt autoremove --yes && apt-get clean \
     && rm -Rf /var/lib/{apt,dpkg}/ && rm -Rf /root/.cache/ \
     && chmod +x /start.sh