feat: 取消在 PHP 中安装 supervisor

This commit is contained in:
zhengkunwang223
2023-12-13 12:23:59 +08:00
parent 02325f9baf
commit 8ffac42da5
56 changed files with 5 additions and 1489 deletions

View File

@@ -129,23 +129,6 @@
],
"envKey": "PHP_EXTENSIONS",
"edit": true
},
{
"type": "select",
"labelZh": "安装 Supervisor",
"labelEn": "Install Supervisor",
"default": "0",
"values": [
{
"label": "否",
"value": "0"
},
{
"label": "是",
"value": "1"
}
],
"envKey": "INSTALL_SUPERVISOR"
}
]
}

View File

@@ -8,7 +8,6 @@ services:
CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
PHP_EXTENSIONS: ${PHP_EXTENSIONS}
TZ: ${TZ}
INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR}
image: ${IMAGE_NAME}
volumes:
- ${SOURCE_DIR}:/www/

View File

@@ -18,12 +18,7 @@ RUN chmod +x install.sh \
RUN apk --no-cache add tzdata \
&& cp "/usr/share/zoneinfo/$TZ" /etc/localtime \
&& echo "$TZ" > /etc/timezone
RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \
apk add --no-cache supervisor && \
mkdir -p /var/log/supervisor ; \
fi
&& echo "$TZ" > /etc/timezone \
# Fix: https://github.com/docker-library/php/issues/1121
RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3