diff --git a/Dockerfiles/dashboards-helper.Dockerfile b/Dockerfiles/dashboards-helper.Dockerfile index 313ba8675..fa76f40ce 100644 --- a/Dockerfiles/dashboards-helper.Dockerfile +++ b/Dockerfiles/dashboards-helper.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.17 # Copyright (c) 2020 Battelle Energy Alliance, LLC. All rights reserved. LABEL maintainer="malcolm@inl.gov" diff --git a/Dockerfiles/name-map-ui.Dockerfile b/Dockerfiles/name-map-ui.Dockerfile index 806c6d0e7..754fa3ae3 100644 --- a/Dockerfiles/name-map-ui.Dockerfile +++ b/Dockerfiles/name-map-ui.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.17 # Copyright (c) 2022 Battelle Energy Alliance, LLC. All rights reserved. LABEL maintainer="malcolm@inl.gov" @@ -26,13 +26,13 @@ ENV LISTJS_VERSION v1.5.0 RUN apk update --no-cache && \ apk upgrade --no-cache && \ - apk --no-cache add bash php8 php8-fpm php8-mysqli php8-json php8-openssl php8-curl php8-fileinfo \ - php8-zlib php8-xml php8-phar php8-intl php8-dom php8-xmlreader php8-ctype php8-session \ - php8-mbstring php8-gd nginx supervisor curl inotify-tools file psmisc shadow openssl tini + apk --no-cache add bash php81 php81-fpm php81-mysqli php81-json php81-openssl php81-curl php81-fileinfo \ + php81-zlib php81-xml php81-phar php81-intl php81-dom php81-xmlreader php81-ctype php81-session \ + php81-mbstring php81-gd nginx supervisor curl inotify-tools file psmisc shadow openssl tini COPY name-map-ui/config/nginx.conf /etc/nginx/nginx.conf -COPY name-map-ui/config/fpm-pool.conf /etc/php8/php-fpm.d/www.conf -COPY name-map-ui/config/php.ini /etc/php8/conf.d/custom.ini +COPY name-map-ui/config/fpm-pool.conf /etc/php81/php-fpm.d/www.conf +COPY name-map-ui/config/php.ini /etc/php81/conf.d/custom.ini COPY name-map-ui/config/supervisord.conf /etc/supervisord.conf COPY name-map-ui/config/supervisor_logstash_ctl.conf /etc/supervisor/logstash/supervisord.conf COPY name-map-ui/config/supervisor_netbox_ctl.conf /etc/supervisor/netbox/supervisord.conf diff --git a/docs/development.md b/docs/development.md index bf0a46e8c..3daa244e6 100644 --- a/docs/development.md +++ b/docs/development.md @@ -58,7 +58,7 @@ Then, go take a walk or something since it will be a while. When you're done, yo * `malcolmnetsec/api` (based on `python:3-slim`) * `malcolmnetsec/arkime` (based on `debian:11-slim`) -* `malcolmnetsec/dashboards-helper` (based on `alpine:3.16`) +* `malcolmnetsec/dashboards-helper` (based on `alpine:3.17`) * `malcolmnetsec/dashboards` (based on `opensearchproject/opensearch-dashboards`) * `malcolmnetsec/file-monitor` (based on `debian:11-slim`) * `malcolmnetsec/file-upload` (based on `debian:11-slim`) @@ -66,7 +66,7 @@ Then, go take a walk or something since it will be a while. When you're done, yo * `malcolmnetsec/freq` (based on `debian:11-slim`) * `malcolmnetsec/htadmin` (based on `debian:11-slim`) * `malcolmnetsec/logstash-oss` (based on `opensearchproject/logstash-oss-with-opensearch-output-plugin`) -* `malcolmnetsec/name-map-ui` (based on `alpine:3.16`) +* `malcolmnetsec/name-map-ui` (based on `alpine:3.17`) * `malcolmnetsec/netbox` (based on `netboxcommunity/netbox:latest`) * `malcolmnetsec/nginx-proxy` (based on `alpine:3.16`) * `malcolmnetsec/opensearch` (based on `opensearchproject/opensearch`) diff --git a/name-map-ui/config/supervisord.conf b/name-map-ui/config/supervisord.conf index e2a1735fe..c6ea33fce 100644 --- a/name-map-ui/config/supervisord.conf +++ b/name-map-ui/config/supervisord.conf @@ -17,7 +17,7 @@ supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface serverurl=unix:///tmp/supervisor-main.sock [program:php-fpm] -command=/usr/sbin/php-fpm8 -F +command=/usr/sbin/php-fpm81 -F stopasgroup=true killasgroup=true stdout_logfile=/dev/fd/1