Skip to content

Commit fc8750d

Browse files
FIX: Added vscode to gitignore & automated docker build with ACT
Signed-off-by: Sebastian Waldbauer <[email protected]>
1 parent 8d1c926 commit fc8750d

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/docker.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Github Workflow to build container image
2-
#
2+
#
33
# SPDX-FileCopyrightText: 2021 Sebastian Waldbauer
44
# SPDX-License-Identifier: AGPL-3.0-or-later
55
#
@@ -17,6 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20+
- name: Check if environment is ACT
21+
run: sudo chown runner:docker /var/run/docker.sock
22+
if: ${{ env.ACT }}
23+
2024
- name: Checkout IntelMQ-Docker
2125
uses: actions/checkout@v2
2226
with:
@@ -57,7 +61,7 @@ jobs:
5761

5862
- name: Login to DockerHub
5963
uses: docker/login-action@v1
60-
if: github.repository == 'certtools/intelmq'
64+
if: github.repository == 'certtools/intelmq' && !${{ env.ACT }}
6165
with:
6266
username: ${{ secrets.DOCKERHUB_USERNAME }}
6367
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -77,7 +81,7 @@ jobs:
7781
./test.sh
7882
7983
- name: Publish develop version to dockerhub
80-
if: github.repository == 'certtools/intelmq'
84+
if: github.repository == 'certtools/intelmq' && !${{ env.ACT }}
8185
run: |
8286
docker tag intelmq-full:latest certat/intelmq-full:develop
8387
docker push certat/intelmq-full:develop

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.*~
1010
*.mmdb
1111
*.profile
12+
.vscode/
1213
.profile
1314
intelmq.egg-info
1415
build
@@ -23,6 +24,7 @@ htmlcov/
2324
*.key
2425
src/
2526
.eggs
27+
.secrets
2628

2729
# sphinx
2830
docs/source

0 commit comments

Comments
 (0)