Skip to content

Commit a78937b

Browse files
ostefanom.amirkar
ostefano
and
m.amirkar
authored
Several changes (#421)
docs(readme): add docker hub note for pulling dependencies and base images fix: add safe_sed_i helper and replace VirtioFS workarounds - Add safe_sed_i() function using mktemp+cat pattern to replace the fragile sed > tmp; cat tmp > file; rm tmp workaround used for VirtioFS compatibility (Docker Desktop for Mac) - Replace dd if=... of=... initial file copies with cat ... > ... for clearer intent - Remove deprecated VirtioFS workaround comments referencing the Docker forum bug report feat: parameterize hardcoded PHP 8.4 references via build arg - Add PHP_PACKAGE_VERSION build arg (default 8.4) to core/Dockerfile - Replace all php8.4 package names, binary paths, and config refs with php for single-point-of-change upgrades - Create /usr/local/sbin/php-fpm symlink so entrypoint scripts use php-fpm instead of hardcoded versioned binary paths - Use @PHP_VERSION@ placeholder in nginx config, templated at build time via sed - Pass PHP_PACKAGE_VERSION to docker-compose build args - Update entrypoint_fpm.sh and kubernetes/entrypoint_fpm.sh to use the version-agnostic php-fpm command feat: add Makefile for common build and runtime tasks Provides convenient targets for the most frequent operations: - build, build-core, build-modules, build-guard, build-slim, bake - up, down, logs for runtime management - shellcheck, clean, prune for maintenance - help target as default to list available commands fix: restore AUTOCONF_ADMIN_KEY backward compat with cleaner pattern Now uses a single export line that expands AUTOCONF_ADMIN_KEY as an inline fallback, keeping backward compat for users with AUTOCONF_ADMIN_KEY in their .env files. Co-authored-by: m.amirkar <m.amirkar@apk-group.net>
1 parent 472ff52 commit a78937b

10 files changed

Lines changed: 187 additions & 108 deletions

File tree

‎Makefile‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
.DEFAULT_GOAL := help
2+
3+
.PHONY: help build build-core build-modules build-guard build-slim bake up down logs shellcheck clean prune
4+
5+
help:
6+
@echo "Usage: make <target>"
7+
@echo ""
8+
@echo "Build targets:"
9+
@echo " build Build all images via docker compose"
10+
@echo " build-core Build misp-core only"
11+
@echo " build-modules Build misp-modules only"
12+
@echo " build-guard Build misp-guard only"
13+
@echo " build-slim Build all slim variant images"
14+
@echo " bake Build all images via docker buildx bake"
15+
@echo ""
16+
@echo "Runtime targets:"
17+
@echo " up Start all services in background"
18+
@echo " down Stop all services"
19+
@echo " logs Tail logs from all services"
20+
@echo ""
21+
@echo "Utility targets:"
22+
@echo " shellcheck Lint shell scripts"
23+
@echo " clean Stop services and remove volumes"
24+
@echo " prune Docker system prune (cleanup)"
25+
26+
build:
27+
docker compose build
28+
29+
build-core:
30+
docker compose build misp-core
31+
32+
build-modules:
33+
docker compose build misp-modules
34+
35+
build-guard:
36+
docker compose build misp-guard
37+
38+
build-slim:
39+
docker compose build --build-arg CORE_FLAVOR=slim --build-arg MODULES_FLAVOR=slim
40+
41+
bake:
42+
docker buildx bake
43+
44+
up:
45+
docker compose up -d
46+
47+
down:
48+
docker compose down
49+
50+
logs:
51+
docker compose logs -f
52+
53+
shellcheck:
54+
shellcheck core/files/*.sh core/files/kubernetes/*.sh guard/files/*.sh
55+
56+
clean:
57+
docker compose down -v --remove-orphans
58+
59+
prune:
60+
docker system prune -af --volumes

‎core/Dockerfile‎

Lines changed: 54 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ FROM "${DOCKER_HUB_PROXY}python:3.14-slim-trixie" AS php-base
55
ENV DEBIAN_FRONTEND=noninteractive
66
ARG CORE_TAG
77
ARG CORE_COMMIT
8-
ARG PHP_VER
8+
ARG PHP_API_VERSION
9+
RUN : "${PHP_API_VERSION:?Build argument PHP_API_VERSION is required and cannot be empty.}"
10+
ARG PHP_PACKAGE_VERSION
11+
RUN : "${PHP_PACKAGE_VERSION:?Build argument PHP_PACKAGE_VERSION is required and cannot be empty.}"
912
ARG CORE_FLAVOR
1013

1114
# Uncomment when building in corporate environments
@@ -29,15 +32,15 @@ RUN <<-EOF
2932
mariadb-client \
3033
rsync \
3134
rsyslog \
32-
php8.4 \
33-
php8.4-curl \
34-
php8.4-xml \
35-
php8.4-mbstring \
36-
php8.4-mysql \
37-
php8.4-redis \
38-
php8.4-gd \
39-
php8.4-fpm \
40-
php8.4-zip \
35+
php${PHP_PACKAGE_VERSION} \
36+
php${PHP_PACKAGE_VERSION}-curl \
37+
php${PHP_PACKAGE_VERSION}-xml \
38+
php${PHP_PACKAGE_VERSION}-mbstring \
39+
php${PHP_PACKAGE_VERSION}-mysql \
40+
php${PHP_PACKAGE_VERSION}-redis \
41+
php${PHP_PACKAGE_VERSION}-gd \
42+
php${PHP_PACKAGE_VERSION}-fpm \
43+
php${PHP_PACKAGE_VERSION}-zip \
4144
unzip \
4245
zip \
4346
curl \
@@ -58,19 +61,19 @@ RUN <<-EOF
5861
mariadb-client \
5962
rsync \
6063
rsyslog \
61-
php8.4 \
62-
php8.4-apcu \
63-
php8.4-curl \
64-
php8.4-xml \
65-
php8.4-intl \
66-
php8.4-bcmath \
67-
php8.4-mbstring \
68-
php8.4-mysql \
69-
php8.4-redis \
70-
php8.4-gd \
71-
php8.4-fpm \
72-
php8.4-zip \
73-
php8.4-ldap \
64+
php${PHP_PACKAGE_VERSION} \
65+
php${PHP_PACKAGE_VERSION}-apcu \
66+
php${PHP_PACKAGE_VERSION}-curl \
67+
php${PHP_PACKAGE_VERSION}-xml \
68+
php${PHP_PACKAGE_VERSION}-intl \
69+
php${PHP_PACKAGE_VERSION}-bcmath \
70+
php${PHP_PACKAGE_VERSION}-mbstring \
71+
php${PHP_PACKAGE_VERSION}-mysql \
72+
php${PHP_PACKAGE_VERSION}-redis \
73+
php${PHP_PACKAGE_VERSION}-gd \
74+
php${PHP_PACKAGE_VERSION}-fpm \
75+
php${PHP_PACKAGE_VERSION}-zip \
76+
php${PHP_PACKAGE_VERSION}-ldap \
7477
libmagic1 \
7578
libldap-common \
7679
librdkafka1 \
@@ -122,15 +125,15 @@ RUN <<-EOF
122125
g++ \
123126
git \
124127
make \
125-
php8.4-dev \
128+
php${PHP_PACKAGE_VERSION}-dev \
126129
php-pear
127130
else
128131
apt-get install -y --no-install-recommends \
129132
gcc \
130133
g++ \
131134
git \
132135
make \
133-
php8.4-dev \
136+
php${PHP_PACKAGE_VERSION}-dev \
134137
php-pear \
135138
libbrotli-dev \
136139
libfuzzy-dev \
@@ -141,9 +144,9 @@ RUN <<-EOF
141144
apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
142145
EOF
143146

144-
RUN update-alternatives --set php /usr/bin/php8.4
145-
RUN update-alternatives --set php-config /usr/bin/php-config8.4
146-
RUN update-alternatives --set phpize /usr/bin/phpize8.4
147+
RUN update-alternatives --set php /usr/bin/php${PHP_PACKAGE_VERSION}
148+
RUN update-alternatives --set php-config /usr/bin/php-config${PHP_PACKAGE_VERSION}
149+
RUN update-alternatives --set phpize /usr/bin/phpize${PHP_PACKAGE_VERSION}
147150

148151
RUN <<-EOF
149152
pecl channel-update pecl.php.net
@@ -158,28 +161,16 @@ RUN <<-EOF
158161
git clone --recursive --depth=1 https://github.com/JakubOnderka/pecl-text-ssdeep.git /tmp/pecl-text-ssdeep
159162
cd /tmp/pecl-text-ssdeep && phpize && ./configure && make && make install
160163
tar -czf /pecl_libs.tar.gz \
161-
/usr/lib/php/${PHP_VER}/ssdeep.so \
162-
/usr/lib/php/${PHP_VER}/rdkafka.so \
163-
/usr/lib/php/${PHP_VER}/brotli.so \
164-
/usr/lib/php/${PHP_VER}/simdjson.so \
165-
/usr/lib/php/${PHP_VER}/zstd.so
164+
/usr/lib/php/${PHP_API_VERSION}/ssdeep.so \
165+
/usr/lib/php/${PHP_API_VERSION}/rdkafka.so \
166+
/usr/lib/php/${PHP_API_VERSION}/brotli.so \
167+
/usr/lib/php/${PHP_API_VERSION}/simdjson.so \
168+
/usr/lib/php/${PHP_API_VERSION}/zstd.so
166169
fi
167170
EOF
168171

169172

170173
FROM php-base AS python-build
171-
ARG PYPI_JSONSCHEMA_VERSION
172-
ARG PYPI_LIEF_VERSION
173-
ARG PYPI_MISP_STIX_VERSION
174-
ARG PYPI_PLYARA_VERSION
175-
ARG PYPI_PYDEEP2_VERSION
176-
ARG PYPI_PYMISP_VERSION
177-
ARG PYPI_PYTHON_MAGIC_VERSION
178-
ARG PYPI_PYZMQ_VERSION
179-
ARG PYPI_REDIS_VERSION
180-
ARG PYPI_TAXII2_CLIENT_VERSION
181-
ARG PYPI_SETUPTOOLS_VERSION
182-
ARG PYPI_SUPERVISOR_VERSION
183174

184175
RUN apt-get install -y --no-install-recommends \
185176
gcc \
@@ -199,6 +190,20 @@ RUN <<-EOF
199190
cd /var/www/MISP || exit; git submodule update --init --recursive .
200191
EOF
201192

193+
ARG PYPI_SETUPTOOLS_VERSION
194+
RUN : "${PYPI_SETUPTOOLS_VERSION:?Build argument PYPI_SETUPTOOLS_VERSION is required and cannot be empty.}"
195+
ARG PYPI_SUPERVISOR_VERSION
196+
RUN : "${PYPI_SUPERVISOR_VERSION:?Build argument PYPI_SUPERVISOR_VERSION is required and cannot be empty.}"
197+
ARG PYPI_JSONSCHEMA_VERSION
198+
ARG PYPI_LIEF_VERSION
199+
ARG PYPI_MISP_STIX_VERSION
200+
ARG PYPI_PLYARA_VERSION
201+
ARG PYPI_PYDEEP2_VERSION
202+
ARG PYPI_PYMISP_VERSION
203+
ARG PYPI_PYTHON_MAGIC_VERSION
204+
ARG PYPI_PYZMQ_VERSION
205+
ARG PYPI_REDIS_VERSION
206+
ARG PYPI_TAXII2_CLIENT_VERSION
202207
RUN <<-EOF
203208
mkdir /wheels
204209

@@ -254,7 +259,8 @@ ENV PATH="/var/www/MISP/app/Console:${PATH}"
254259

255260
# Remove some defaults (kernel logging) and fix alternatives
256261
RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
257-
RUN update-alternatives --set php /usr/bin/php8.4
262+
RUN update-alternatives --set php /usr/bin/php${PHP_PACKAGE_VERSION}
263+
RUN ln -sf /usr/sbin/php-fpm${PHP_PACKAGE_VERSION} /usr/local/sbin/php-fpm
258264
RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
259265

260266
# Install python modules
@@ -309,6 +315,8 @@ EOF
309315

310316
# Copy all our image specific files to appropriate locations
311317
COPY files/ /
318+
# Template PHP version into nginx config
319+
RUN sed -i "s/@PHP_PACKAGE_VERSION@/${PHP_PACKAGE_VERSION}/g" /etc/nginx/includes/misp
312320
ENTRYPOINT [ "/entrypoint.sh" ]
313321

314322
# Change Workdirectory

‎core/files/entrypoint.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ export MISP_MODULES_FQDN=${MISP_MODULES_FQDN:-http://misp-modules}
5353
export ATTACHMENTS_DIR=${ATTACHMENTS_DIR:-/var/www/MISP/app/files}
5454

5555
export AUTOCONF_GPG=${AUTOCONF_GPG:-true}
56-
export AUTOCONF_ADMIN_KEY=${AUTOCONF_ADMIN_KEY:-true}
57-
export AUTOGEN_ADMIN_KEY=${AUTOGEN_ADMIN_KEY:-$AUTOCONF_ADMIN_KEY}
56+
export AUTOGEN_ADMIN_KEY=${AUTOGEN_ADMIN_KEY:-${AUTOCONF_ADMIN_KEY:-true}}
5857
export OIDC_ENABLE=${OIDC_ENABLE:-false}
5958
export OIDC_MIXEDAUTH=${OIDC_MIXEDAUTH:-false}
6059
export OIDC_AUTH_METHOD=${OIDC_AUTH_METHOD:-client_secret_post}

‎core/files/entrypoint_fpm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fi
110110
echo "Configure PHP | Change PHP values ..." && change_php_vars
111111

112112
echo "Configure PHP | Starting PHP FPM"
113-
/usr/sbin/php-fpm8.4 -R -F & master_pid=$!
113+
/usr/local/sbin/php-fpm -R -F & master_pid=$!
114114

115115
# Wait for it
116116
wait "$master_pid"

‎core/files/entrypoint_nginx.sh‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ update_database_tls_config() {
5252
rm -f "$tmp"
5353
}
5454

55+
# safe_sed_i avoids sed -i which creates temp files alongside the target,
56+
# broken on VirtioFS (Docker Desktop for Mac). Uses mktemp + cat pattern.
57+
safe_sed_i() {
58+
local file="${@: -1}"
59+
local tmp
60+
tmp="$(mktemp)"
61+
if sed "${@:1:$(($#-1))}" "$file" > "$tmp" && [[ -s "$tmp" ]]; then
62+
cat "$tmp" > "$file"
63+
fi
64+
rm -f "$tmp"
65+
}
66+
5567
init_mysql(){
5668
# Test when MySQL is ready....
5769
# wait for Database come ready
@@ -90,32 +102,26 @@ init_misp_data_files(){
90102
# Init config (shared with host)
91103
echo "... initialize configuration files"
92104
MISP_APP_CONFIG_PATH=/var/www/MISP/app/Config
93-
# workaround for https://forums.docker.com/t/sed-couldnt-open-temporary-file-xyz-permission-denied-when-using-virtiofs/125473
94-
# [ -f $MISP_APP_CONFIG_PATH/bootstrap.php ] || cp $MISP_APP_CONFIG_PATH.dist/bootstrap.default.php $MISP_APP_CONFIG_PATH/bootstrap.php
95-
# [ -f $MISP_APP_CONFIG_PATH/database.php ] || cp $MISP_APP_CONFIG_PATH.dist/database.default.php $MISP_APP_CONFIG_PATH/database.php
96-
# [ -f $MISP_APP_CONFIG_PATH/core.php ] || cp $MISP_APP_CONFIG_PATH.dist/core.default.php $MISP_APP_CONFIG_PATH/core.php
97-
# [ -f $MISP_APP_CONFIG_PATH/config.php ] || cp $MISP_APP_CONFIG_PATH.dist/config.default.php $MISP_APP_CONFIG_PATH/config.php
98-
# [ -f $MISP_APP_CONFIG_PATH/email.php ] || cp $MISP_APP_CONFIG_PATH.dist/email.php $MISP_APP_CONFIG_PATH/email.php
99-
# [ -f $MISP_APP_CONFIG_PATH/routes.php ] || cp $MISP_APP_CONFIG_PATH.dist/routes.php $MISP_APP_CONFIG_PATH/routes.php
100-
[ -s $MISP_APP_CONFIG_PATH/bootstrap.php ] || dd if=$MISP_APP_CONFIG_PATH.dist/bootstrap.default.php of=$MISP_APP_CONFIG_PATH/bootstrap.php
101-
[ -s $MISP_APP_CONFIG_PATH/database.php ] || dd if=$MISP_APP_CONFIG_PATH.dist/database.default.php of=$MISP_APP_CONFIG_PATH/database.php
102-
[ -s $MISP_APP_CONFIG_PATH/core.php ] || dd if=$MISP_APP_CONFIG_PATH.dist/core.default.php of=$MISP_APP_CONFIG_PATH/core.php
103-
[ -s $MISP_APP_CONFIG_PATH/config.php.template ] || dd if=$MISP_APP_CONFIG_PATH.dist/config.default.php of=$MISP_APP_CONFIG_PATH/config.php.template
105+
# Avoid cp/sed -i which create temp files alongside the target,
106+
# broken on VirtioFS (Docker Desktop for Mac).
107+
[ -s $MISP_APP_CONFIG_PATH/bootstrap.php ] || cat $MISP_APP_CONFIG_PATH.dist/bootstrap.default.php > $MISP_APP_CONFIG_PATH/bootstrap.php
108+
[ -s $MISP_APP_CONFIG_PATH/database.php ] || cat $MISP_APP_CONFIG_PATH.dist/database.default.php > $MISP_APP_CONFIG_PATH/database.php
109+
[ -s $MISP_APP_CONFIG_PATH/core.php ] || cat $MISP_APP_CONFIG_PATH.dist/core.default.php > $MISP_APP_CONFIG_PATH/core.php
110+
[ -s $MISP_APP_CONFIG_PATH/config.php.template ] || cat $MISP_APP_CONFIG_PATH.dist/config.default.php > $MISP_APP_CONFIG_PATH/config.php.template
104111
[ -s $MISP_APP_CONFIG_PATH/config.php ] || echo -e "<?php\n\$config=array();\n?>" > $MISP_APP_CONFIG_PATH/config.php
105-
[ -s $MISP_APP_CONFIG_PATH/email.php ] || dd if=$MISP_APP_CONFIG_PATH.dist/email.php of=$MISP_APP_CONFIG_PATH/email.php
106-
[ -s $MISP_APP_CONFIG_PATH/routes.php ] || dd if=$MISP_APP_CONFIG_PATH.dist/routes.php of=$MISP_APP_CONFIG_PATH/routes.php
112+
[ -s $MISP_APP_CONFIG_PATH/email.php ] || cat $MISP_APP_CONFIG_PATH.dist/email.php > $MISP_APP_CONFIG_PATH/email.php
113+
[ -s $MISP_APP_CONFIG_PATH/routes.php ] || cat $MISP_APP_CONFIG_PATH.dist/routes.php > $MISP_APP_CONFIG_PATH/routes.php
107114

108115
if ! grep -q "Detect what auth modules" "$MISP_APP_CONFIG_PATH/bootstrap.php"; then
109116
echo "... patch bootstrap.php settings"
110117
chmod +w $MISP_APP_CONFIG_PATH/bootstrap.php
111-
# workaround for https://forums.docker.com/t/sed-couldnt-open-temporary-file-xyz-permission-denied-when-using-virtiofs/125473
112-
sed -z "s|CakePlugin::loadAll(array(.*CakeResque.*));||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
113-
sed "s|CakePlugin::load('AadAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
114-
sed "s|CakePlugin::load('CertAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
115-
sed "s|CakePlugin::load('LdapAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
116-
sed "s|CakePlugin::load('LinOTPAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
117-
sed "s|CakePlugin::load('OidcAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
118-
sed "s|CakePlugin::load('ShibbAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/bootstrap.php; rm tmp
118+
safe_sed_i -z "s|CakePlugin::loadAll(array(.*CakeResque.*));||g" $MISP_APP_CONFIG_PATH/bootstrap.php
119+
safe_sed_i "s|CakePlugin::load('AadAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php
120+
safe_sed_i "s|CakePlugin::load('CertAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php
121+
safe_sed_i "s|CakePlugin::load('LdapAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php
122+
safe_sed_i "s|CakePlugin::load('LinOTPAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php
123+
safe_sed_i "s|CakePlugin::load('OidcAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php
124+
safe_sed_i "s|CakePlugin::load('ShibbAuth');||g" $MISP_APP_CONFIG_PATH/bootstrap.php
119125
cat <<EOT >> $MISP_APP_CONFIG_PATH/bootstrap.php
120126
121127
/**
@@ -152,18 +158,14 @@ EOT
152158
fi
153159

154160
echo "... initialize database.php settings"
155-
# workaround for https://forums.docker.com/t/sed-couldnt-open-temporary-file-xyz-permission-denied-when-using-virtiofs/125473
156-
# sed -i "s/localhost/$MYSQL_HOST/" $MISP_APP_CONFIG_PATH/database.php
157-
# sed -i "s/db\s*login/$MYSQL_USER/" $MISP_APP_CONFIG_PATH/database.php
158-
# sed -i "s/3306/$MYSQL_PORT/" $MISP_APP_CONFIG_PATH/database.php
159-
# sed -i "s/db\s*password/$MYSQL_PASSWORD/" $MISP_APP_CONFIG_PATH/database.php
160-
# sed -i "s/'database' => 'misp'/'database' => '$MYSQL_DATABASE'/" $MISP_APP_CONFIG_PATH/database.php
161+
# Avoid sed -i which creates temp files alongside the target,
162+
# broken on VirtioFS (Docker Desktop for Mac).
161163
chmod +w $MISP_APP_CONFIG_PATH/database.php
162-
sed "s/localhost/$MYSQL_HOST/" $MISP_APP_CONFIG_PATH/database.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/database.php; rm tmp
163-
sed "s/db\s*login/$MYSQL_USER/" $MISP_APP_CONFIG_PATH/database.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/database.php; rm tmp
164-
sed "s/3306/$MYSQL_PORT/" $MISP_APP_CONFIG_PATH/database.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/database.php; rm tmp
165-
sed "s/db\s*password/$MYSQL_PASSWORD/" $MISP_APP_CONFIG_PATH/database.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/database.php; rm tmp
166-
sed "s/'database' => 'misp'/'database' => '$MYSQL_DATABASE'/" $MISP_APP_CONFIG_PATH/database.php > tmp; cat tmp > $MISP_APP_CONFIG_PATH/database.php; rm tmp
164+
safe_sed_i "s/localhost/$MYSQL_HOST/" $MISP_APP_CONFIG_PATH/database.php
165+
safe_sed_i "s/db\s*login/$MYSQL_USER/" $MISP_APP_CONFIG_PATH/database.php
166+
safe_sed_i "s/3306/$MYSQL_PORT/" $MISP_APP_CONFIG_PATH/database.php
167+
safe_sed_i "s/db\s*password/$MYSQL_PASSWORD/" $MISP_APP_CONFIG_PATH/database.php
168+
safe_sed_i "s/'database' => 'misp'/'database' => '$MYSQL_DATABASE'/" $MISP_APP_CONFIG_PATH/database.php
167169

168170
# Enable MySQL TLS immediately, as TLS requiring hosts like AWS RDS may banlist non-TLS connecting hosts
169171
# Conversely, this is also a good spot to disable it if required

‎core/files/etc/nginx/includes/misp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ location / {
2222

2323
location ~ ^/[^/]+\.php(/|$) {
2424
include snippets/fastcgi-php.conf;
25-
fastcgi_pass unix:/var/run/php/php8.4-fpm.sock;
25+
fastcgi_pass unix:/var/run/php/php@PHP_PACKAGE_VERSION@-fpm.sock;
2626
fastcgi_read_timeout 300s;
2727
fastcgi_send_timeout 300s;
2828
fastcgi_connect_timeout 300s;

‎core/files/kubernetes/entrypoint_fpm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ echo "Configure PHP | Change PHP values ..." && change_php_vars
3434

3535
echo "Configure PHP | Starting PHP FPM"
3636

37-
exec /usr/bin/tini -- /usr/sbin/php-fpm8.4 -R -F
37+
exec /usr/bin/tini -- /usr/local/sbin/php-fpm -R -F

0 commit comments

Comments
 (0)