Skip to content

Commit 47dcf68

Browse files
akiletourakiletour
committed
chore: find another way to overide mpm prefork
1 parent 35448b6 commit 47dcf68

18 files changed

Lines changed: 36 additions & 27 deletions

‎Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,14 @@ RUN set -eux; \
163163
mkdir -p /etc/apache2/sites-available; \
164164
touch /etc/apache2/sites-available/000-default.conf; \
165165
mkdir -p /etc/apache2/conf-enabled; \
166-
mkdir -p /etc/apache2/mods-enabled; \
166+
mkdir -p /etc/apache2/mpm-overrides; \
167167
chown -R ${INRAGE_USER_ID}:${INRAGE_GROUP_ID} \
168168
"${PHP_INI_DIR}/conf.d" \
169169
/etc/apache2/sites-available/000-default.conf \
170170
/etc/apache2/conf-enabled \
171-
/etc/apache2/mods-enabled \
171+
/etc/apache2/mpm-overrides \
172172
/etc/msmtprc; \
173+
echo 'IncludeOptional /etc/apache2/mpm-overrides/mpm_prefork.conf' > /etc/apache2/conf-enabled/mpm-overrides.conf; \
173174
# Download helper scripts.
174175
dockerplatform="${TARGETPLATFORM:-linux/amd64}"; \
175176
dockerplatform=$(printf '%s' "$dockerplatform" | tr '/' '-'); \

‎docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ process_templates() {
2929

3030
_gotpl "docker-apache-vhost.conf.tmpl" "/etc/apache2/sites-available/000-default.conf"
3131
_gotpl "docker-apache-remoteip.conf.tmpl" "/etc/apache2/conf-enabled/remoteip.conf"
32-
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mods-enabled/mpm_prefork.conf"
32+
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mpm-overrides/mpm_prefork.conf"
3333

3434
_gotpl "msmtprc.tmpl" "/etc/msmtprc"
3535
}

‎latest/php8.1/apache/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,14 @@ RUN set -eux; \
157157
mkdir -p /etc/apache2/sites-available; \
158158
touch /etc/apache2/sites-available/000-default.conf; \
159159
mkdir -p /etc/apache2/conf-enabled; \
160-
mkdir -p /etc/apache2/mods-enabled; \
160+
mkdir -p /etc/apache2/mpm-overrides; \
161161
chown -R ${INRAGE_USER_ID}:${INRAGE_GROUP_ID} \
162162
"${PHP_INI_DIR}/conf.d" \
163163
/etc/apache2/sites-available/000-default.conf \
164164
/etc/apache2/conf-enabled \
165-
/etc/apache2/mods-enabled \
165+
/etc/apache2/mpm-overrides \
166166
/etc/msmtprc; \
167+
echo 'IncludeOptional /etc/apache2/mpm-overrides/mpm_prefork.conf' > /etc/apache2/conf-enabled/mpm-overrides.conf; \
167168
# Download helper scripts.
168169
dockerplatform="${TARGETPLATFORM:-linux/amd64}"; \
169170
dockerplatform=$(printf '%s' "$dockerplatform" | tr '/' '-'); \

‎latest/php8.1/apache/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ process_templates() {
2929

3030
_gotpl "docker-apache-vhost.conf.tmpl" "/etc/apache2/sites-available/000-default.conf"
3131
_gotpl "docker-apache-remoteip.conf.tmpl" "/etc/apache2/conf-enabled/remoteip.conf"
32-
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mods-enabled/mpm_prefork.conf"
32+
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mpm-overrides/mpm_prefork.conf"
3333

3434
_gotpl "msmtprc.tmpl" "/etc/msmtprc"
3535
}

‎latest/php8.1/fpm/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,14 @@ RUN set -eux; \
154154
mkdir -p /etc/apache2/sites-available; \
155155
touch /etc/apache2/sites-available/000-default.conf; \
156156
mkdir -p /etc/apache2/conf-enabled; \
157-
mkdir -p /etc/apache2/mods-enabled; \
157+
mkdir -p /etc/apache2/mpm-overrides; \
158158
chown -R ${INRAGE_USER_ID}:${INRAGE_GROUP_ID} \
159159
"${PHP_INI_DIR}/conf.d" \
160160
/etc/apache2/sites-available/000-default.conf \
161161
/etc/apache2/conf-enabled \
162-
/etc/apache2/mods-enabled \
162+
/etc/apache2/mpm-overrides \
163163
/etc/msmtprc; \
164+
echo 'IncludeOptional /etc/apache2/mpm-overrides/mpm_prefork.conf' > /etc/apache2/conf-enabled/mpm-overrides.conf; \
164165
# Download helper scripts.
165166
dockerplatform="${TARGETPLATFORM:-linux/amd64}"; \
166167
dockerplatform=$(printf '%s' "$dockerplatform" | tr '/' '-'); \

‎latest/php8.1/fpm/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ process_templates() {
2929

3030
_gotpl "docker-apache-vhost.conf.tmpl" "/etc/apache2/sites-available/000-default.conf"
3131
_gotpl "docker-apache-remoteip.conf.tmpl" "/etc/apache2/conf-enabled/remoteip.conf"
32-
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mods-enabled/mpm_prefork.conf"
32+
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mpm-overrides/mpm_prefork.conf"
3333

3434
_gotpl "msmtprc.tmpl" "/etc/msmtprc"
3535
}

‎latest/php8.2/apache/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,14 @@ RUN set -eux; \
157157
mkdir -p /etc/apache2/sites-available; \
158158
touch /etc/apache2/sites-available/000-default.conf; \
159159
mkdir -p /etc/apache2/conf-enabled; \
160-
mkdir -p /etc/apache2/mods-enabled; \
160+
mkdir -p /etc/apache2/mpm-overrides; \
161161
chown -R ${INRAGE_USER_ID}:${INRAGE_GROUP_ID} \
162162
"${PHP_INI_DIR}/conf.d" \
163163
/etc/apache2/sites-available/000-default.conf \
164164
/etc/apache2/conf-enabled \
165-
/etc/apache2/mods-enabled \
165+
/etc/apache2/mpm-overrides \
166166
/etc/msmtprc; \
167+
echo 'IncludeOptional /etc/apache2/mpm-overrides/mpm_prefork.conf' > /etc/apache2/conf-enabled/mpm-overrides.conf; \
167168
# Download helper scripts.
168169
dockerplatform="${TARGETPLATFORM:-linux/amd64}"; \
169170
dockerplatform=$(printf '%s' "$dockerplatform" | tr '/' '-'); \

‎latest/php8.2/apache/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ process_templates() {
2929

3030
_gotpl "docker-apache-vhost.conf.tmpl" "/etc/apache2/sites-available/000-default.conf"
3131
_gotpl "docker-apache-remoteip.conf.tmpl" "/etc/apache2/conf-enabled/remoteip.conf"
32-
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mods-enabled/mpm_prefork.conf"
32+
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mpm-overrides/mpm_prefork.conf"
3333

3434
_gotpl "msmtprc.tmpl" "/etc/msmtprc"
3535
}

‎latest/php8.2/fpm/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,14 @@ RUN set -eux; \
154154
mkdir -p /etc/apache2/sites-available; \
155155
touch /etc/apache2/sites-available/000-default.conf; \
156156
mkdir -p /etc/apache2/conf-enabled; \
157-
mkdir -p /etc/apache2/mods-enabled; \
157+
mkdir -p /etc/apache2/mpm-overrides; \
158158
chown -R ${INRAGE_USER_ID}:${INRAGE_GROUP_ID} \
159159
"${PHP_INI_DIR}/conf.d" \
160160
/etc/apache2/sites-available/000-default.conf \
161161
/etc/apache2/conf-enabled \
162-
/etc/apache2/mods-enabled \
162+
/etc/apache2/mpm-overrides \
163163
/etc/msmtprc; \
164+
echo 'IncludeOptional /etc/apache2/mpm-overrides/mpm_prefork.conf' > /etc/apache2/conf-enabled/mpm-overrides.conf; \
164165
# Download helper scripts.
165166
dockerplatform="${TARGETPLATFORM:-linux/amd64}"; \
166167
dockerplatform=$(printf '%s' "$dockerplatform" | tr '/' '-'); \

‎latest/php8.2/fpm/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ process_templates() {
2929

3030
_gotpl "docker-apache-vhost.conf.tmpl" "/etc/apache2/sites-available/000-default.conf"
3131
_gotpl "docker-apache-remoteip.conf.tmpl" "/etc/apache2/conf-enabled/remoteip.conf"
32-
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mods-enabled/mpm_prefork.conf"
32+
_gotpl "docker-apache-prefork.conf.tmpl" "/etc/apache2/mpm-overrides/mpm_prefork.conf"
3333

3434
_gotpl "msmtprc.tmpl" "/etc/msmtprc"
3535
}

0 commit comments

Comments
 (0)