Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v23.04.0 development #247

Merged
merged 60 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
62518b1
Restore idaholab/Malcolm fork branding
mmguero Nov 17, 2022
46af12c
Malcolm v6.4.3 is a minor release containing enhancements, component …
mmguero Dec 6, 2022
6edda8f
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Jan 9, 2023
79ab70b
Fix merge error
mmguero Jan 9, 2023
4aa3d23
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Jan 9, 2023
76525ca
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm
mmguero Jan 9, 2023
9fa4c78
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Feb 3, 2023
cd61e41
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Mar 8, 2023
46bbaaa
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Mar 8, 2023
4adf3c9
Merge pull request #156 from mmguero-dev/v23.03.0_merge_idaholab
mmguero Mar 8, 2023
94cc510
bump development version to v23.03.1
mmguero Mar 8, 2023
bf0e027
fix missing alt-tex
mmguero Mar 8, 2023
42d65f1
fix idaholab/Malcolm#160, clarify information about auth_setup's use …
mmguero Mar 10, 2023
c597fdd
for idaholab/Malcolm#157, autostart install.py --configure on Malcolm…
mmguero Mar 10, 2023
687a146
Added installation of icsnpp-synchrophasor
mmguero Mar 13, 2023
f126641
update Zeek to v5.2.0 (work in progress, idaholab/Malcolm#161
mmguero Mar 13, 2023
a9dd123
Updates for zeek v5.2.0
mmguero Mar 14, 2023
29b793d
added rsync utility to docker images
mmguero Mar 15, 2023
0995db2
zeek fix
mmguero Mar 15, 2023
a6209ab
trigger workflow build
Mar 16, 2023
0c14303
Trigger workflow on kubernetes branch
Mar 16, 2023
11022e4
Merge branch 'main' of https://github.com/idaholab/Malcolm into devel…
mmguero Mar 17, 2023
7769196
restore development branch links
mmguero Mar 17, 2023
f787969
configmap docker-uid-gid.sh
mmguero Mar 17, 2023
56d15ad
attempt to fix pages build?
malcolminl Mar 17, 2023
aa5f23f
Fix netbox build
malcolminl Mar 17, 2023
58acdbc
revert 56d15adf32a13ba401052c5c1145a29e1f6d8b36
malcolminl Mar 17, 2023
a22807b
attempt to fix pages build?
malcolminl Mar 17, 2023
f4d8267
for idaholab/Malcolm#163, move docker images from docker.io/malcolmne…
malcolminl Mar 17, 2023
9274a17
fix version tagging
malcolminl Mar 17, 2023
2073ab5
Fix NetBox build
malcolminl Mar 17, 2023
fd68be8
further work for zeek v5.2, fix issues parsing files.log, idaholab/Ma…
malcolminl Mar 17, 2023
75407ca
further work for zeek v5.2, fix issues parsing files.log, idaholab/Ma…
malcolminl Mar 17, 2023
8628775
for idaholab/Malcolm#157, make sure root auto-configure doesn't bypas…
mmguero Mar 17, 2023
df7f1c9
Fix idaholab/Malcolm#164, disable save session on exit
mmguero Mar 17, 2023
128e087
bump fluent-bit in script
mmguero Mar 21, 2023
8efd68b
rewording documentation
mmguero Mar 27, 2023
51f1b27
bump YARA to v4.3.0 (https://github.com/VirusTotal/yara/releases/tag/…
mmguero Mar 27, 2023
0c28230
added install.py questions for NetBox site name and ICS best guess
mmguero Mar 29, 2023
ceac9c9
ease transfer of certs, etc. using croc
mmguero Mar 30, 2023
d2ffd6f
ease transfer of certs, etc. using croc
mmguero Mar 30, 2023
dea3a71
Make auth_setup give you a choice instead of having to go through eve…
mmguero Mar 30, 2023
546d5b5
Make auth_setup give you a choice instead of having to go through eve…
mmguero Mar 30, 2023
d20b1ea
improvements to receiving crt files
mmguero Mar 31, 2023
f0f81fe
increase number of allowed nested fields in a composable template fro…
mmguero Apr 3, 2023
7b86eb1
bump version to v23.04.0
mmguero Apr 4, 2023
8421a5b
Fix issues with configure-capture and auth_setup scripts
mmguero Apr 4, 2023
acebb09
Fix issues with configure-capture and auth_setup scripts
mmguero Apr 4, 2023
c05b30c
Fix issues with configure-capture and auth_setup scripts
mmguero Apr 4, 2023
3a031a8
Fix idaholab/Malcolm#178, docker-compose move from go-yaml/v3 breaks …
mmguero Apr 4, 2023
f8932c6
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Apr 4, 2023
fde8b86
Added sha1sums for ISOs
mmguero Apr 4, 2023
2c8d3dd
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Apr 4, 2023
c3f4b72
touch a few necessary files before checking for auth config
mmguero Apr 4, 2023
3b4d07b
force set malcolm template timestamp to 'date' type
mmguero Apr 4, 2023
1ed555a
Added sha1sums for ISOs
mmguero Apr 4, 2023
18c4af7
revert 3b4d07b6c079ced33eb1e09f1c9e18ca01ccc28e, instead just use cor…
mmguero Apr 4, 2023
c8e8310
don't rebuild nginx-proxy docs on download.md change
mmguero Apr 4, 2023
c998dac
update SHA sums for ISOs
mmguero Apr 5, 2023
462b7d3
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
mmguero Apr 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
**/.envrc
**/.direnv
**/.opensearch*.curlrc
.configured
.trigger_workflow_build
.tmp
docker-compose*yml
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/api-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'api/**'
- 'Dockerfiles/api.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/api.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/api:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/api:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/arkime-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'arkime/**'
- 'Dockerfiles/arkime.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -61,4 +64,4 @@ jobs:
build-args: |
MAXMIND_GEOIP_DB_LICENSE_KEY=${{ secrets.MAXMIND_GEOIP_DB_LICENSE_KEY }}
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/arkime:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/arkime:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/dashboards-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'dashboards/**'
- 'Dockerfiles/dashboards.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/dashboards.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/dashboards:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/dashboards-helper-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'dashboards/**'
- 'Dockerfiles/dashboards-helper.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/dashboards-helper.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/dashboards-helper:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards-helper:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/file-monitor-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'file-monitor/**'
- 'Dockerfiles/file-monitor.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/file-monitor.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/file-monitor:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-monitor:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/file-upload-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'file-upload/**'
- 'Dockerfiles/file-upload.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/file-upload.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/file-upload:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-upload:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/filebeat-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'filebeat/**'
- 'Dockerfiles/filebeat.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/filebeat.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/filebeat-oss:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/filebeat-oss:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/freq-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'freq-server/**'
- 'Dockerfiles/freq.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/freq.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/freq:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/freq:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/htadmin-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'htadmin/**'
- 'Dockerfiles/htadmin.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/htadmin.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/htadmin:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/htadmin:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/logstash-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'logstash/**'
- 'Dockerfiles/logstash.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/logstash.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/logstash-oss:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/logstash-oss:${{ steps.extract_branch.outputs.branch }}
6 changes: 4 additions & 2 deletions .github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'malcolm-iso/**'
- 'shared/bin/*'
- '!shared/bin/configure-capture.py'
- '.trigger_iso_workflow_build'
- '.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml'
workflow_dispatch:
Expand Down Expand Up @@ -94,7 +96,7 @@ jobs:
run: |
IMAGES=( $(grep image: docker-compose.yml | awk '{print $2}' | sort -u) )
for IMAGE in "${IMAGES[@]}"; do
REPO_IMAGE="$(echo "$IMAGE" | sed "s@^\(malcolmnetsec\)@ghcr.io/${{ github.repository_owner }}/\1@" | sed "s/:.*/:${{ steps.extract_branch.outputs.branch }}/")"
REPO_IMAGE="$(echo "$IMAGE" | sed "s@^.*\(malcolm\)@ghcr.io/${{ github.repository_owner }}/\1@" | sed "s/:.*/:${{ steps.extract_branch.outputs.branch }}/")"
docker pull "$REPO_IMAGE" && \
docker tag "$REPO_IMAGE" "$IMAGE" && \
docker rmi "$REPO_IMAGE"
Expand Down Expand Up @@ -124,4 +126,4 @@ jobs:
with:
context: ./malcolm-iso
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/malcolm:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/malcolm:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/name-map-ui-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'name-map-ui/**'
- 'Dockerfiles/name-map-ui.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/name-map-ui.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/name-map-ui:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/name-map-ui:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/netbox-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'netbox/**'
- 'Dockerfiles/netbox.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/netbox.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/netbox:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/netbox:${{ steps.extract_branch.outputs.branch }}
6 changes: 5 additions & 1 deletion .github/workflows/nginx-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'nginx/**'
- 'Dockerfiles/nginx.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
- '_config.yml'
- '_includes/**'
- '_layouts/**'
- 'docs/**'
- '!docs/download.md'
- 'Gemfile'
- 'README.md'
workflow_dispatch:
Expand Down Expand Up @@ -73,4 +77,4 @@ jobs:
VCS_REVISION=${{ steps.extract_commit_sha.outputs.sha }}
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/nginx-proxy:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/nginx-proxy:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/opensearch-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'Dockerfiles/opensearch.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -58,4 +61,4 @@ jobs:
context: .
file: ./Dockerfiles/opensearch.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/opensearch:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/opensearch:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/pcap-capture-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'pcap-capture/**'
- 'Dockerfiles/pcap-capture.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/pcap-capture.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/pcap-capture:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/pcap-capture:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/pcap-monitor-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'pcap-monitor/**'
- 'Dockerfiles/pcap-monitor.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -59,4 +62,4 @@ jobs:
context: .
file: ./Dockerfiles/pcap-monitor.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/pcap-monitor:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/pcap-monitor:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/postgresql-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'Dockerfiles/postgresql.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -58,4 +61,4 @@ jobs:
context: .
file: ./Dockerfiles/postgresql.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/postgresql:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/postgresql:${{ steps.extract_branch.outputs.branch }}
5 changes: 4 additions & 1 deletion .github/workflows/redis-build-and-push-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ on:
branches:
- main
- development
- kubernetes
paths:
- 'Dockerfiles/redis.Dockerfile'
- 'shared/bin/*'
- '!shared/bin/configure-interfaces.py'
- '!shared/bin/configure-capture.py'
- '.trigger_workflow_build'
workflow_dispatch:
repository_dispatch:
Expand Down Expand Up @@ -58,4 +61,4 @@ jobs:
context: .
file: ./Dockerfiles/redis.Dockerfile
push: true
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/redis:${{ steps.extract_branch.outputs.branch }}
tags: ghcr.io/${{ github.repository_owner }}/malcolm/redis:${{ steps.extract_branch.outputs.branch }}
Loading