Skip to content

Commit 37bb7f7

Browse files
authored
Merge pull request #247 from mmguero-dev/v23.04.0_merge_cisagov
Malcolm v23.04.0 is a release with enhancements, component version updates and bug fixes. IMPORTANT NOTE: In March 2023 Docker Inc. announced its decision to sunset the "Docker Free Team" plan, which prompted us to decide to migrate away from Docker Hub to the Github Container Registry or "ghcr" (see idaholab#163). Due to public backlash, Docker Inc. reversed its decision. However, the Malcolm project will continue with the decision to use GHCR beginning with this release (Malcolm v23.04.0) and moving forward. If you're updating an existing instance of Malcolm, it's recommended that you back up your `docker-compose.yml` and `docker-compose-standalone.yml` files, replace them with the ones from this release and re-run `./scripts/install.py --configure` to ensure that you're pointing at the latest images (this is actually always good practice when moving to a new release of Malcolm). v23.03.0...v23.04.0 * Enhancements - autostart `install.py --configure` on Malcolm ISO first boot (idaholab#157) - clarify information about auth_setup's use of external OpenSearch connections (idaholab#160) - migrate away from DockerHub container registry (idaholab#163) - give easier option for transferring SSL client files from Malcolm to forwarder (idaholab#177) + added `tx-rx-secure.sh` script as wrapper around [croc](https://github.com/schollz/croc) automatically creating and using a local-only relay * Component version updates - [Zeek v5.2.0](https://github.com/zeek/zeek/releases) (idaholab#161) - [fluent bit v2.0.10](https://fluentbit.io/announcements/v2.0.10/) - [NetBox v3.4.7](https://github.com/netbox-community/netbox/releases/tag/v3.4.7) * Fixes - XFCE4's "save session on exit" causes conflict with Hedgehog kiosk mode if firefox instance is started upon session restore (idaholab#164) - docker-compose move from go-yaml/v3 breaks Malcolm's docker-compose YAML files (idaholab#178, docker/compose#10411) - increase index.mapping.nested_fields.limit in opensearch index template (idaholab#180)
2 parents de48bbe + 462b7d3 commit 37bb7f7

91 files changed

Lines changed: 1433 additions & 983 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
**/.envrc
1515
**/.direnv
1616
**/.opensearch*.curlrc
17+
.configured
1718
.trigger_workflow_build
1819
.tmp
1920
docker-compose*yml

‎.github/workflows/api-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'api/**'
1011
- 'Dockerfiles/api.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/api.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/api:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/api:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/arkime-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'arkime/**'
1011
- 'Dockerfiles/arkime.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -61,4 +64,4 @@ jobs:
6164
build-args: |
6265
MAXMIND_GEOIP_DB_LICENSE_KEY=${{ secrets.MAXMIND_GEOIP_DB_LICENSE_KEY }}
6366
push: true
64-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/arkime:${{ steps.extract_branch.outputs.branch }}
67+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/arkime:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/dashboards-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'dashboards/**'
1011
- 'Dockerfiles/dashboards.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/dashboards.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/dashboards:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/dashboards-helper-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'dashboards/**'
1011
- 'Dockerfiles/dashboards-helper.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/dashboards-helper.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/dashboards-helper:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/dashboards-helper:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/file-monitor-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'file-monitor/**'
1011
- 'Dockerfiles/file-monitor.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/file-monitor.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/file-monitor:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-monitor:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/file-upload-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'file-upload/**'
1011
- 'Dockerfiles/file-upload.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/file-upload.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/file-upload:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/file-upload:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/filebeat-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'filebeat/**'
1011
- 'Dockerfiles/filebeat.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/filebeat.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/filebeat-oss:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/filebeat-oss:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/freq-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'freq-server/**'
1011
- 'Dockerfiles/freq.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/freq.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/freq:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/freq:${{ steps.extract_branch.outputs.branch }}

‎.github/workflows/htadmin-build-and-push-ghcr.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ on:
55
branches:
66
- main
77
- development
8+
- kubernetes
89
paths:
910
- 'htadmin/**'
1011
- 'Dockerfiles/htadmin.Dockerfile'
1112
- 'shared/bin/*'
13+
- '!shared/bin/configure-interfaces.py'
14+
- '!shared/bin/configure-capture.py'
1215
- '.trigger_workflow_build'
1316
workflow_dispatch:
1417
repository_dispatch:
@@ -59,4 +62,4 @@ jobs:
5962
context: .
6063
file: ./Dockerfiles/htadmin.Dockerfile
6164
push: true
62-
tags: ghcr.io/${{ github.repository_owner }}/malcolmnetsec/htadmin:${{ steps.extract_branch.outputs.branch }}
65+
tags: ghcr.io/${{ github.repository_owner }}/malcolm/htadmin:${{ steps.extract_branch.outputs.branch }}

0 commit comments

Comments
 (0)