-
Notifications
You must be signed in to change notification settings - Fork 335
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …
…into v24.07.0_merge_cisagov
- Loading branch information
Showing
164 changed files
with
4,280 additions
and
1,927 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG TARGETPLATFORM=linux/amd64 | ||
|
||
FROM --platform=${TARGETPLATFORM} docker.elastic.co/beats/filebeat-oss:8.14.1 | ||
FROM --platform=${TARGETPLATFORM} docker.elastic.co/beats/filebeat-oss:8.14.3 | ||
|
||
# Copyright (c) 2024 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG TARGETPLATFORM=linux/amd64 | ||
|
||
FROM --platform=${TARGETPLATFORM} docker.elastic.co/logstash/logstash-oss:8.14.1 | ||
FROM --platform=${TARGETPLATFORM} docker.elastic.co/logstash/logstash-oss:8.14.3 | ||
|
||
LABEL maintainer="[email protected]" | ||
LABEL org.opencontainers.image.authors='[email protected]' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG TARGETPLATFORM=linux/amd64 | ||
|
||
FROM --platform=${TARGETPLATFORM} netboxcommunity/netbox:v4.0.6 | ||
FROM --platform=${TARGETPLATFORM} netboxcommunity/netbox:v4.0.8 | ||
|
||
# Copyright (c) 2024 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,7 +34,7 @@ RUN find /site -type f -name "*.md" -exec sed -i "s/{{[[:space:]]*site.github.bu | |
find /site/_site -type f -name "*.html" -exec sed -i 's@\(href=\)"/"@\1"/readme/"@g' "{}" \; | ||
|
||
# build NGINX image | ||
FROM --platform=${TARGETPLATFORM} alpine:3.18 | ||
FROM --platform=${TARGETPLATFORM} alpine:3.20 | ||
|
||
LABEL maintainer="[email protected]" | ||
LABEL org.opencontainers.image.authors='[email protected]' | ||
|
@@ -162,7 +162,7 @@ RUN set -x ; \ | |
" ; \ | ||
apk update --no-cache; \ | ||
apk upgrade --no-cache; \ | ||
apk add --no-cache curl rsync shadow libressl; \ | ||
apk add --no-cache curl rsync shadow openssl; \ | ||
addgroup -g ${DEFAULT_GID} -S ${PGROUP} ; \ | ||
adduser -S -D -H -u ${DEFAULT_UID} -h /var/cache/nginx -s /sbin/nologin -G ${PGROUP} -g ${PUSER} ${PUSER} ; \ | ||
addgroup ${PUSER} shadow ; \ | ||
|
@@ -173,7 +173,7 @@ RUN set -x ; \ | |
geoip-dev \ | ||
gnupg \ | ||
libc-dev \ | ||
libressl-dev \ | ||
openssl-dev \ | ||
libxslt-dev \ | ||
linux-headers \ | ||
make \ | ||
|
@@ -226,7 +226,7 @@ RUN set -x ; \ | |
| xargs -r apk info --installed \ | ||
| sort -u \ | ||
)" ; \ | ||
apk add --no-cache --virtual .nginx-rundeps $runDeps ca-certificates bash jq wget openssl apache2-utils openldap shadow stunnel supervisor tini tzdata; \ | ||
apk add --no-cache --virtual .nginx-rundeps $runDeps ca-certificates bash jq wget apache2-utils openldap shadow stunnel supervisor tini tzdata; \ | ||
update-ca-certificates; \ | ||
apk del .nginx-build-deps ; \ | ||
apk del .gettext ; \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -78,7 +78,6 @@ exclude: | |
- htadmin | ||
- logstash | ||
- malcolm-iso | ||
- net-map.json | ||
- netbox | ||
- nginx | ||
- opensearch | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.