Skip to content

Commit

Permalink
Merge pull request #2153 from certtools/enh-waldbauer-docker
Browse files Browse the repository at this point in the history
FIX: Added vscode to gitignore & automated docker build with ACT
  • Loading branch information
aaronkaplan authored Feb 9, 2022
2 parents 8d1c926 + fc8750d commit 4de6607
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Github Workflow to build container image
#
#
# SPDX-FileCopyrightText: 2021 Sebastian Waldbauer
# SPDX-License-Identifier: AGPL-3.0-or-later
#
Expand All @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*.*~
*.mmdb
*.profile
.vscode/
.profile
intelmq.egg-info
build
Expand All @@ -23,6 +24,7 @@ htmlcov/
*.key
src/
.eggs
.secrets

# sphinx
docs/source
Expand Down

0 comments on commit 4de6607

Please sign in to comment.