Skip to content

Commit f36cddb

Browse files
committed
Merge branch 'staging' of https://github.com/idaholab/Malcolm
2 parents 1933a32 + 9321041 commit f36cddb

80 files changed

Lines changed: 367 additions & 121 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.

.trigger_workflow_build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# this file exists solely for the purpose of being updated and seen by github to trigger a commit build action
2-
0
2+
1

Dockerfiles/dashboards-helper.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ENV DASHBOARDS_TIMEPICKER_FROM $DASHBOARDS_TIMEPICKER_FROM
4646
ENV DASHBOARDS_TIMEPICKER_TO $DASHBOARDS_TIMEPICKER_TO
4747
ENV PATH="/data:${PATH}"
4848

49-
ENV SUPERCRONIC_VERSION "0.2.39"
49+
ENV SUPERCRONIC_VERSION "0.2.40"
5050
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
5151
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
5252

Dockerfiles/dirinit.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.22
1+
FROM alpine:3.23
22

33
# Copyright (c) 2025 Battelle Energy Alliance, LLC. All rights reserved.
44
LABEL maintainer="malcolm@inl.gov"

Dockerfiles/file-monitor.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ENV EXTRACTED_FILE_HTTP_SERVER_KEY $EXTRACTED_FILE_HTTP_SERVER_KEY
9898
ENV EXTRACTED_FILE_HTTP_SERVER_RECURSIVE $EXTRACTED_FILE_HTTP_SERVER_RECURSIVE
9999
ENV EXTRACTED_FILE_HTTP_SERVER_PORT $EXTRACTED_FILE_HTTP_SERVER_PORT
100100

101-
ENV SUPERCRONIC_VERSION "0.2.39"
101+
ENV SUPERCRONIC_VERSION "0.2.40"
102102
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
103103
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
104104

Dockerfiles/file-upload.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ENV FILEPOND_SERVER_BRANCH $FILEPOND_SERVER_BRANCH
5656
ARG STALE_UPLOAD_DELETE_MIN=360
5757
ENV STALE_UPLOAD_DELETE_MIN $STALE_UPLOAD_DELETE_MIN
5858

59-
ENV SUPERCRONIC_VERSION "0.2.39"
59+
ENV SUPERCRONIC_VERSION "0.2.40"
6060
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
6161
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
6262

Dockerfiles/filebeat.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ARG FILEBEAT_SYSLOG_TCP_LISTEN=false
6969
ARG FILEBEAT_SYSLOG_UDP_LISTEN=false
7070
ARG PCAP_NODE_NAME=malcolm
7171

72-
ENV SUPERCRONIC_VERSION "0.2.39"
72+
ENV SUPERCRONIC_VERSION "0.2.40"
7373
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
7474
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
7575

Dockerfiles/netbox.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM netboxcommunity/netbox:v4.4.6
1+
FROM netboxcommunity/netbox:v4.4.8
22

33
# Copyright (c) 2025 Battelle Energy Alliance, LLC. All rights reserved.
44
LABEL maintainer="malcolm@inl.gov"

Dockerfiles/nginx.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN find /site -type f -name "*.md" -exec sed -i "s/{{[[:space:]]*site.github.bu
4848
find /site/_site -type f -name "*.html" -exec sed -i 's@\(href=\)"/"@\1"/readme/"@g' "{}" \;
4949

5050
# build NGINX image
51-
FROM alpine:3.22
51+
FROM alpine:3.23
5252

5353
LABEL maintainer="malcolm@inl.gov"
5454
LABEL org.opencontainers.image.authors='malcolm@inl.gov'

Dockerfiles/suricata.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ENV PUSER_RLIMIT_UNLOCK true
3333
# see PUSER_CHOWN at the bottom of the file (after the other environment variables it references)
3434
USER root
3535

36-
ENV SUPERCRONIC_VERSION "0.2.39"
36+
ENV SUPERCRONIC_VERSION "0.2.40"
3737
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
3838
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
3939

Dockerfiles/zeek.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ADD --chmod=644 scripts/malcolm_constants.py /usr/local/bin/
5656
ADD zeek/custom-pkg "$ZEEK_DIR"/custom-pkg
5757
ADD --chmod=644 zeek/requirements.txt /usr/local/src/requirements.txt
5858

59-
ENV SUPERCRONIC_VERSION "0.2.39"
59+
ENV SUPERCRONIC_VERSION "0.2.40"
6060
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-"
6161
ENV SUPERCRONIC_CRONTAB "${ZEEK_DIR}/crontab"
6262

0 commit comments

Comments
 (0)