From fc8750da9e1746b7758c5b64060071c91ab32863 Mon Sep 17 00:00:00 2001
From: Sebastian Waldbauer <waldbauer@cert.at>
Date: Tue, 8 Feb 2022 11:43:02 +0100
Subject: [PATCH] FIX: Added vscode to gitignore & automated docker build with
 ACT

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
---
 .github/workflows/docker.yml | 10 +++++++---
 .gitignore                   |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9a71f41db..05ffbc361 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,5 +1,5 @@
 # Github Workflow to build container image
-# 
+#
 # SPDX-FileCopyrightText: 2021 Sebastian Waldbauer
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
@@ -17,6 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Check if environment is ACT
+        run: sudo chown runner:docker /var/run/docker.sock
+        if: ${{ env.ACT }}
+
       - name: Checkout IntelMQ-Docker
         uses: actions/checkout@v2
         with:
@@ -57,7 +61,7 @@ jobs:
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: github.repository == 'certtools/intelmq'
+        if: github.repository == 'certtools/intelmq' && !${{ env.ACT }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -77,7 +81,7 @@ jobs:
           ./test.sh
 
       - name: Publish develop version to dockerhub
-        if: github.repository == 'certtools/intelmq'
+        if: github.repository == 'certtools/intelmq' && !${{ env.ACT }}
         run: |
           docker tag intelmq-full:latest certat/intelmq-full:develop
           docker push certat/intelmq-full:develop
diff --git a/.gitignore b/.gitignore
index 5fa076283..61d2cb56d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *.*~
 *.mmdb
 *.profile
+.vscode/
 .profile
 intelmq.egg-info
 build
@@ -23,6 +24,7 @@ htmlcov/
 *.key
 src/
 .eggs
+.secrets
 
 # sphinx
 docs/source