Skip to content

Commit 5848a05

Browse files
mmguerommguero
authored
Merge pull request #307 from idaholab/v23.12.0_merge_idaholab
Malcolm v23.12.0
2 parents 3c77095 + 64cba5e commit 5848a05

File tree

134 files changed

+3077
-1664
lines changed

Some content is hidden

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

134 files changed

+3077
-1664
lines changed

‎Dockerfiles/dashboards-helper.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ ENV DASHBOARDS_URL $DASHBOARDS_URL
4747
ENV DASHBOARDS_DARKMODE $DASHBOARDS_DARKMODE
4848
ENV PATH="/data:${PATH}"
4949

50-
ENV SUPERCRONIC_VERSION "0.2.27"
50+
ENV SUPERCRONIC_VERSION "0.2.28"
5151
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64"
5252
ENV SUPERCRONIC "supercronic-linux-amd64"
53-
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63"
53+
ENV SUPERCRONIC_SHA1SUM "fe1a81a8a5809deebebbd7a209a3b97e542e2bcd"
5454
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
5555

5656
ENV ECS_RELEASES_URL "https://api.github.com/repos/elastic/ecs/releases/latest"

‎Dockerfiles/dashboards.Dockerfile

Lines changed: 34 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,4 @@
1-
# build ####################################################################
2-
FROM amazonlinux:2 AS build
3-
4-
# Copyright (c) 2023 Battelle Energy Alliance, LLC. All rights reserved.
5-
6-
# set up build environment for dashboard plugins built from source
7-
8-
ARG DEFAULT_UID=1000
9-
ARG DEFAULT_GID=1000
10-
ENV DEFAULT_UID $DEFAULT_UID
11-
ENV DEFAULT_GID $DEFAULT_GID
12-
ENV PUSER "dashboarder"
13-
ENV PGROUP "dashboarder"
14-
15-
ENV TERM xterm
16-
17-
ARG OPENSEARCH_VERSION="2.8.0"
18-
ENV OPENSEARCH_VERSION $OPENSEARCH_VERSION
19-
20-
ARG OPENSEARCH_DASHBOARDS_VERSION="2.8.0"
21-
ENV OPENSEARCH_DASHBOARDS_VERSION $OPENSEARCH_DASHBOARDS_VERSION
22-
23-
# base system dependencies for checking out and building plugins
24-
25-
USER root
26-
27-
RUN amazon-linux-extras install -y epel && \
28-
yum upgrade -y && \
29-
yum install -y curl patch procps psmisc tar zip unzip gcc-c++ make moreutils jq git && \
30-
amazon-linux-extras install -y python3.8 && \
31-
ln -s -r -f /usr/bin/python3.8 /usr/bin/python3 && \
32-
ln -s -r -f /usr/bin/pip3.8 /usr/bin/pip3 && \
33-
groupadd -g ${DEFAULT_GID} ${PGROUP} && \
34-
adduser -u ${DEFAULT_UID} -d /home/${PUSER} -s /bin/bash -G ${PGROUP} -g ${PUSER} ${PUSER} && \
35-
mkdir -p /usr/share && \
36-
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch --branch "${OPENSEARCH_VERSION}" https://github.com/opensearch-project/OpenSearch /usr/share/opensearch && \
37-
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch --branch "${OPENSEARCH_DASHBOARDS_VERSION}" https://github.com/opensearch-project/OpenSearch-Dashboards /usr/share/opensearch-dashboards && \
38-
chown -R ${DEFAULT_UID}:${DEFAULT_GID} /usr/share/opensearch-dashboards /usr/share/opensearch
39-
40-
# build plugins as non-root
41-
42-
USER ${PUSER}
43-
44-
# use nodenv (https://github.com/nodenv/nodenv) to manage nodejs/yarn
45-
46-
ENV PATH "/home/${PUSER}/.nodenv/bin:${PATH}"
47-
48-
RUN git clone --single-branch --depth=1 --recurse-submodules --shallow-submodules https://github.com/nodenv/nodenv.git /home/${PUSER}/.nodenv && \
49-
cd /home/${PUSER}/.nodenv && \
50-
./src/configure && \
51-
make -C src && \
52-
cd /tmp && \
53-
eval "$(nodenv init -)" && \
54-
mkdir -p "$(nodenv root)"/plugins && \
55-
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch https://github.com/nodenv/node-build.git "$(nodenv root)"/plugins/node-build && \
56-
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch https://github.com/nodenv/nodenv-update.git "$(nodenv root)"/plugins/nodenv-update && \
57-
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch https://github.com/pine/nodenv-yarn-install.git "$(nodenv root)"/plugins/nodenv-yarn-install && \
58-
nodenv install "$(cat /usr/share/opensearch-dashboards/.node-version)" && \
59-
nodenv global "$(cat /usr/share/opensearch-dashboards/.node-version)"
60-
61-
# check out and build plugins
62-
63-
RUN eval "$(nodenv init -)" && \
64-
mkdir -p /usr/share/opensearch-dashboards/plugins && \
65-
git clone --depth 1 --recurse-submodules --shallow-submodules --single-branch --branch opensearch-v2-dashboards-compatibility https://github.com/mmguero-dev/osd_sankey_vis.git /usr/share/opensearch-dashboards/plugins/sankey_vis && \
66-
cd /usr/share/opensearch-dashboards/plugins/sankey_vis && \
67-
yarn osd bootstrap && \
68-
yarn install && \
69-
yarn build --opensearch-dashboards-version "${OPENSEARCH_DASHBOARDS_VERSION}" && \
70-
mv ./build/kbnSankeyVis-"${OPENSEARCH_DASHBOARDS_VERSION}".zip ./build/kbnSankeyVis.zip
71-
72-
# runtime ##################################################################
73-
74-
FROM opensearchproject/opensearch-dashboards:2.8.0
1+
FROM opensearchproject/opensearch-dashboards:2.11.1
752

763
LABEL maintainer="malcolm@inl.gov"
774
LABEL org.opencontainers.image.authors='malcolm@inl.gov'
@@ -93,7 +20,7 @@ ENV PUSER_PRIV_DROP true
9320
ENV TERM xterm
9421

9522
ENV TINI_VERSION v0.19.0
96-
ENV OSD_TRANSFORM_VIS_VERSION 2.8.0
23+
ENV OSD_TRANSFORM_VIS_VERSION 2.11.0
9724

9825
ARG OPENSEARCH_URL="http://opensearch:9200"
9926
ARG OPENSEARCH_PRIMARY="opensearch-local"
@@ -115,22 +42,20 @@ ENV NODE_OPTIONS $NODE_OPTIONS
11542

11643
USER root
11744

118-
COPY --from=build /usr/share/opensearch-dashboards/plugins/sankey_vis/build/kbnSankeyVis.zip /tmp/kbnSankeyVis.zip
11945
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
12046
ADD https://github.com/lguillaud/osd_transform_vis/releases/download/$OSD_TRANSFORM_VIS_VERSION/transformVis-$OSD_TRANSFORM_VIS_VERSION.zip /tmp/transformVis.zip
12147

12248
RUN yum upgrade -y && \
123-
yum install -y curl psmisc util-linux openssl rsync python3 zip unzip && \
49+
yum install -y curl-minimal psmisc findutils util-linux openssl rsync python3 zip unzip && \
50+
yum remove -y vim-* && \
12451
usermod -a -G tty ${PUSER} && \
12552
# Malcolm manages authentication and encryption via NGINX reverse proxy
12653
/usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin remove securityDashboards --allow-root && \
127-
cd /usr/share/opensearch-dashboards/plugins && \
128-
/usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin install file:///tmp/kbnSankeyVis.zip --allow-root && \
12954
cd /tmp && \
130-
# unzip transformVis.zip opensearch-dashboards/transformVis/opensearch_dashboards.json opensearch-dashboards/transformVis/package.json && \
131-
# sed -i "s/2\.9\.0/2\.9\.0/g" opensearch-dashboards/transformVis/opensearch_dashboards.json && \
132-
# sed -i "s/2\.9\.0/2\.9\.0/g" opensearch-dashboards/transformVis/package.json && \
133-
# zip transformVis.zip opensearch-dashboards/transformVis/opensearch_dashboards.json opensearch-dashboards/transformVis/package.json && \
55+
unzip transformVis.zip opensearch-dashboards/transformVis/opensearch_dashboards.json opensearch-dashboards/transformVis/package.json && \
56+
sed -i "s/2\.11\.0/2\.11\.1/g" opensearch-dashboards/transformVis/opensearch_dashboards.json && \
57+
sed -i "s/2\.11\.0/2\.11\.1/g" opensearch-dashboards/transformVis/package.json && \
58+
zip transformVis.zip opensearch-dashboards/transformVis/opensearch_dashboards.json opensearch-dashboards/transformVis/package.json && \
13459
cd /usr/share/opensearch-dashboards/plugins && \
13560
/usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin install file:///tmp/transformVis.zip --allow-root && \
13661
rm -rf /tmp/transformVis /tmp/opensearch-dashboards && \
@@ -150,15 +75,32 @@ ADD scripts/malcolm_utils.py /usr/local/bin/
15075
# Yeah, I know about https://opensearch.org/docs/latest/dashboards/branding ... but I can't figure out a way
15176
# to specify the entries in the opensearch_dashboards.yml such that they are valid BOTH from the
15277
# internal opensearch code validating them AND the web browser retrieving them. So we're going scorched earth instead.
153-
ADD docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_logo.svg
154-
ADD docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_logo_dark_mode.svg
155-
ADD docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_logo_default_mode.svg
156-
ADD docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_mark_dark_mode.svg
157-
ADD docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/default_branding/opensearch_mark_default_mode.svg
158-
ADD docs/images/favicon/favicon.ico /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon.ico
159-
ADD docs/images/favicon/favicon16.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon-16x16.png
160-
ADD docs/images/favicon/favicon32.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon-32x32.png
161-
ADD docs/images/favicon/apple-touch-icon-precomposed.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/apple-touch-icon.png
78+
79+
COPY --chmod=644 docs/images/favicon/favicon192.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/android-chrome-192x192.png
80+
COPY --chmod=644 docs/images/favicon/favicon512.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/android-chrome-512x512.png
81+
COPY --chmod=644 docs/images/favicon/apple-touch-icon-precomposed.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/apple-touch-icon.png
82+
COPY --chmod=644 docs/images/favicon/favicon16.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon-16x16.png
83+
COPY --chmod=644 docs/images/favicon/favicon32.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon-32x32.png
84+
COPY --chmod=644 docs/images/favicon/favicon.ico /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/favicon.ico
85+
COPY --chmod=644 docs/images/favicon/favicon144.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/mstile-144x144.png
86+
COPY --chmod=644 docs/images/favicon/favicon150.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/mstile-150x150.png
87+
COPY --chmod=644 docs/images/favicon/favicon310.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/mstile-310x310.png
88+
COPY --chmod=644 docs/images/favicon/favicon70.png /usr/share/opensearch-dashboards/src/core/server/core_app/assets/favicons/mstile-70x70.png
89+
COPY --chmod=644 docs/images/logo/Malcolm.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch.svg
90+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_center_mark.svg
91+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_center_mark_on_dark.svg
92+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_center_mark_on_light.svg
93+
COPY --chmod=644 docs/images/logo/Malcolm.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_dashboards.svg
94+
COPY --chmod=644 docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_dashboards_on_dark.svg
95+
COPY --chmod=644 docs/images/logo/Malcolm.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg
96+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_mark.svg
97+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_mark_on_dark.svg
98+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_mark_on_light.svg
99+
COPY --chmod=644 docs/images/logo/malcolm_logo.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_on_dark.svg
100+
COPY --chmod=644 docs/images/logo/Malcolm.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_on_light.svg
101+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_spinner.svg
102+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_spinner_on_dark.svg
103+
COPY --chmod=644 docs/images/icon/malcolm_mark_dashboards.svg /usr/share/opensearch-dashboards/src/core/server/core_app/assets/logos/opensearch_spinner_on_light.svg
162104

163105

164106
ENTRYPOINT ["/usr/bin/tini", \

‎Dockerfiles/file-monitor.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ ENV EXTRACTED_FILE_HTTP_SERVER_ENCRYPT $EXTRACTED_FILE_HTTP_SERVER_ENCRYPT
9393
ENV EXTRACTED_FILE_HTTP_SERVER_KEY $EXTRACTED_FILE_HTTP_SERVER_KEY
9494
ENV EXTRACTED_FILE_HTTP_SERVER_PORT $EXTRACTED_FILE_HTTP_SERVER_PORT
9595

96-
ENV SUPERCRONIC_VERSION "0.2.27"
96+
ENV SUPERCRONIC_VERSION "0.2.28"
9797
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64"
9898
ENV SUPERCRONIC "supercronic-linux-amd64"
99-
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63"
99+
ENV SUPERCRONIC_SHA1SUM "fe1a81a8a5809deebebbd7a209a3b97e542e2bcd"
100100
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
101101

102102
COPY --chmod=755 shared/bin/yara_rules_setup.sh /usr/local/bin/

‎Dockerfiles/file-upload.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ ENV FILEPOND_SERVER_BRANCH $FILEPOND_SERVER_BRANCH
4949
ARG STALE_UPLOAD_DELETE_MIN=360
5050
ENV STALE_UPLOAD_DELETE_MIN $STALE_UPLOAD_DELETE_MIN
5151

52-
ENV SUPERCRONIC_VERSION "0.2.27"
52+
ENV SUPERCRONIC_VERSION "0.2.28"
5353
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64"
5454
ENV SUPERCRONIC "supercronic-linux-amd64"
55-
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63"
55+
ENV SUPERCRONIC_SHA1SUM "fe1a81a8a5809deebebbd7a209a3b97e542e2bcd"
5656
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
5757

5858
COPY --from=npmget /usr/local/lib/node_modules/filepond /var/www/upload/filepond

‎Dockerfiles/filebeat.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.elastic.co/beats/filebeat-oss:8.10.4
1+
FROM docker.elastic.co/beats/filebeat-oss:8.11.1
22

33
# Copyright (c) 2023 Battelle Energy Alliance, LLC. All rights reserved.
44
LABEL maintainer="malcolm@inl.gov"
@@ -61,10 +61,10 @@ ARG FILEBEAT_TCP_PARSE_TARGET_FIELD=""
6161
ARG FILEBEAT_TCP_PARSE_DROP_FIELD=""
6262
ARG FILEBEAT_TCP_TAG="_malcolm_beats"
6363

64-
ENV SUPERCRONIC_VERSION "0.2.27"
64+
ENV SUPERCRONIC_VERSION "0.2.28"
6565
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64"
6666
ENV SUPERCRONIC "supercronic-linux-amd64"
67-
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63"
67+
ENV SUPERCRONIC_SHA1SUM "fe1a81a8a5809deebebbd7a209a3b97e542e2bcd"
6868
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
6969

7070
ENV TINI_VERSION v0.19.0

‎Dockerfiles/logstash.Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.elastic.co/logstash/logstash-oss:8.10.4
1+
FROM docker.elastic.co/logstash/logstash-oss:8.11.1
22

33
LABEL maintainer="malcolm@inl.gov"
44
LABEL org.opencontainers.image.authors='malcolm@inl.gov'
@@ -32,6 +32,8 @@ ARG LOGSTASH_NETBOX_ENRICHMENT=false
3232
ARG LOGSTASH_NETBOX_ENRICHMENT_VERBOSE=false
3333
ARG LOGSTASH_NETBOX_ENRICHMENT_LOOKUP_SERVICE=true
3434
ARG LOGSTASH_NETBOX_AUTO_POPULATE=false
35+
ARG LOGSTASH_NETBOX_CACHE_SIZE=1000
36+
ARG LOGSTASH_NETBOX_CACHE_TTL=30
3537

3638
ENV LOGSTASH_ENRICHMENT_PIPELINE $LOGSTASH_ENRICHMENT_PIPELINE
3739
ENV LOGSTASH_PARSE_PIPELINE_ADDRESSES $LOGSTASH_PARSE_PIPELINE_ADDRESSES
@@ -42,6 +44,8 @@ ENV LOGSTASH_NETBOX_ENRICHMENT $LOGSTASH_NETBOX_ENRICHMENT
4244
ENV LOGSTASH_NETBOX_ENRICHMENT_VERBOSE $LOGSTASH_NETBOX_ENRICHMENT_VERBOSE
4345
ENV LOGSTASH_NETBOX_ENRICHMENT_LOOKUP_SERVICE $LOGSTASH_NETBOX_ENRICHMENT_LOOKUP_SERVICE
4446
ENV LOGSTASH_NETBOX_AUTO_POPULATE $LOGSTASH_NETBOX_AUTO_POPULATE
47+
ENV LOGSTASH_NETBOX_CACHE_SIZE $LOGSTASH_NETBOX_CACHE_SIZE
48+
ENV LOGSTASH_NETBOX_CACHE_TTL $LOGSTASH_NETBOX_CACHE_TTL
4549

4650
USER root
4751

@@ -63,11 +67,12 @@ RUN set -x && \
6367
pip3 install ipaddress supervisor manuf pyyaml && \
6468
export JAVA_HOME=/usr/share/logstash/jdk && \
6569
/usr/share/logstash/vendor/jruby/bin/jruby -S gem install bundler && \
66-
echo "gem 'lru_cache'" >> /usr/share/logstash/Gemfile && \
70+
echo "gem 'concurrent-ruby'" >> /usr/share/logstash/Gemfile && \
6771
echo "gem 'deep_merge'" >> /usr/share/logstash/Gemfile && \
6872
echo "gem 'fuzzy-string-match'" >> /usr/share/logstash/Gemfile && \
69-
echo "gem 'stringex'" >> /usr/share/logstash/Gemfile && \
73+
echo "gem 'lru_redux'" >> /usr/share/logstash/Gemfile && \
7074
echo "gem 'psych'" >> /usr/share/logstash/Gemfile && \
75+
echo "gem 'stringex'" >> /usr/share/logstash/Gemfile && \
7176
/usr/share/logstash/bin/ruby -S bundle install && \
7277
logstash-plugin install --preserve logstash-filter-translate logstash-filter-cidr logstash-filter-dns \
7378
logstash-filter-json logstash-filter-prune logstash-filter-http \

‎Dockerfiles/netbox.Dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM netboxcommunity/netbox:v3.6.4
1+
FROM netboxcommunity/netbox:v3.6.6
22

33
# Copyright (c) 2023 Battelle Energy Alliance, LLC. All rights reserved.
44
LABEL maintainer="malcolm@inl.gov"
@@ -24,10 +24,10 @@ ENV PUSER "ubuntu"
2424
ENV PGROUP "ubuntu"
2525
ENV PUSER_PRIV_DROP true
2626

27-
ENV SUPERCRONIC_VERSION "0.2.27"
27+
ENV SUPERCRONIC_VERSION "0.2.28"
2828
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64"
2929
ENV SUPERCRONIC "supercronic-linux-amd64"
30-
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63"
30+
ENV SUPERCRONIC_SHA1SUM "fe1a81a8a5809deebebbd7a209a3b97e542e2bcd"
3131
ENV SUPERCRONIC_CRONTAB "/etc/crontab"
3232

3333
ENV YQ_VERSION "4.33.3"
@@ -39,25 +39,31 @@ ARG NETBOX_DEVICETYPE_LIBRARY_PATH="/opt/netbox-devicetype-library"
3939
ARG NETBOX_DEFAULT_SITE=Malcolm
4040
ARG NETBOX_CRON=true
4141
ARG NETBOX_PRELOAD_PATH="/opt/netbox-preload"
42+
ARG NETBOX_PRELOAD_PREFIXES=false
4243

4344
ENV NETBOX_PATH /opt/netbox
4445
ENV BASE_PATH netbox
4546
ENV NETBOX_DEVICETYPE_LIBRARY_PATH $NETBOX_DEVICETYPE_LIBRARY_PATH
4647
ENV NETBOX_DEFAULT_SITE $NETBOX_DEFAULT_SITE
4748
ENV NETBOX_CRON $NETBOX_CRON
4849
ENV NETBOX_PRELOAD_PATH $NETBOX_PRELOAD_PATH
50+
ENV NETBOX_PRELOAD_PREFIXES $NETBOX_PRELOAD_PREFIXES
4951

5052
ADD netbox/patch/* /tmp/netbox-patches/
5153

5254
RUN apt-get -q update && \
5355
apt-get -y -q --no-install-recommends upgrade && \
5456
apt-get install -q -y --no-install-recommends \
5557
gcc \
58+
file \
5659
git \
5760
jq \
61+
libmagic-dev \
62+
libmagic1 \
5863
libpq-dev \
5964
libpq5 \
6065
patch \
66+
postgresql-client \
6167
procps \
6268
psmisc \
6369
python3-dev \
@@ -68,6 +74,7 @@ RUN apt-get -q update && \
6874
'git+https://github.com/tobiasge/netbox-initializers' \
6975
psycopg2 \
7076
pynetbox \
77+
python-magic \
7178
python-slugify \
7279
randomcolor && \
7380
cd "${NETBOX_PATH}" && \

0 commit comments

Comments
 (0)