Skip to content

Commit 99d649c

Browse files
committed
fix: review format support
1 parent 61c1c63 commit 99d649c

3 files changed

Lines changed: 49 additions & 58 deletions

File tree

hyperf/.scripts/setup-dev.sh

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,22 @@ echo "[$1] Installing PHP extensions and dependencies"
1717
apk add --no-cache \
1818
libstdc++ \
1919
ca-certificates \
20+
curl \
21+
unzip \
2022
libc6-compat \
2123
openjdk17-jre \
22-
autoconf \
23-
g++ \
24-
make \
25-
linux-headers
24+
php83-pecl-xdebug \
25+
php83-pecl-pcov
2626

27-
# Install Xdebug via PECL
28-
pecl install xdebug
29-
docker-php-ext-enable xdebug
30-
31-
# Install PCOV
32-
pecl install pcov
33-
docker-php-ext-enable pcov
34-
35-
# Configure PHP for development
27+
cd /etc/php83
3628
{
3729
echo "opcache.enable=0"
3830
echo "opcache.interned_strings_buffer=72"
39-
echo "memory_limit=-1"
31+
} >> conf.d/99_php.ini
32+
{
4033
echo "xdebug.mode=develop,debug,coverage"
4134
echo "xdebug.idekey=PHPSTORM"
42-
echo "xdebug.client_host=host.docker.internal"
43-
echo "xdebug.client_port=9003"
44-
} >> /usr/local/etc/php/conf.d/zzz_1_devitools_php_dev.ini
35+
} >> conf.d/50_xdebug.ini
4536

4637
mkdir -p /opt
4738
curl -fSL https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-x64.zip \

hyperf/.scripts/setup.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ set -e
33
TIMEZONE=${1:-UTC}
44

55
git config --global --add safe.directory /opt/www
6-
76
git config --global init.defaultBranch main
87

98
# - config PHP

hyperf/Dockerfile

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.3-cli-alpine
1+
FROM alpine:3.20
22

33
ARG CONTEXT
44
ARG TIMEZONE
@@ -22,51 +22,52 @@ WORKDIR /opt/www
2222
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
2323

2424
RUN apk add --no-cache \
25-
php83-bcmath \
26-
php83-ctype \
27-
php83-curl \
28-
php83-dom \
29-
php83-fileinfo \
30-
php83-fpm \
31-
php83-gd \
32-
php83-iconv \
33-
php83-intl \
34-
php83-mbstring \
35-
php83-opcache \
36-
php83-openssl \
37-
php83-pcntl \
38-
php83-pdo \
39-
php83-pdo_mysql \
40-
php83-pecl-decimal \
41-
php83-pecl-ds \
42-
php83-pecl-mcrypt \
43-
php83-pecl-mongodb \
44-
php83-pecl-rdkafka \
45-
php83-pecl-redis \
46-
php83-pecl-swoole \
47-
php83-phar \
48-
php83-posix \
49-
php83-simplexml \
50-
php83-sodium \
51-
php83-tokenizer \
52-
php83-xml \
53-
php83-xmlreader \
54-
php83-xmlwriter \
55-
php83-zip \
56-
&& mv /etc/php/php.ini /etc/php83/conf.d/zzz_0_devitools_php_dev.ini \
57-
&& mv /etc/php/php-fpm.conf /etc/php83/php-fpm.d/zphp.conf
25+
php83-bcmath=8.3.15-r0 \
26+
php83-ctype=8.3.15-r0 \
27+
php83-curl=8.3.15-r0 \
28+
php83-dom=8.3.15-r0 \
29+
php83-fileinfo=8.3.15-r0 \
30+
php83-fpm=8.3.15-r0 \
31+
php83-gd=8.3.15-r0 \
32+
php83-iconv=8.3.15-r0 \
33+
php83-intl=8.3.15-r0 \
34+
php83-mbstring=8.3.15-r0 \
35+
php83-opcache=8.3.15-r0 \
36+
php83-openssl=8.3.15-r0 \
37+
php83-pcntl=8.3.15-r0 \
38+
php83-pdo=8.3.15-r0 \
39+
php83-pdo_mysql=8.3.15-r0 \
40+
php83-pecl-decimal=1.5.0-r1 \
41+
php83-pecl-ds=1.5.0-r0 \
42+
php83-pecl-mcrypt=1.0.7-r0 \
43+
php83-pecl-mongodb=1.19.1-r0 \
44+
php83-pecl-rdkafka=6.0.5-r0 \
45+
php83-pecl-redis=6.1.0-r0 \
46+
php83-pecl-swoole=5.1.6-r0 \
47+
php83-phar=8.3.15-r0 \
48+
php83-posix=8.3.15-r0 \
49+
php83-simplexml=8.3.15-r0 \
50+
php83-sodium=8.3.15-r0 \
51+
php83-tokenizer=8.3.15-r0 \
52+
php83-xml=8.3.15-r0 \
53+
php83-xmlreader=8.3.15-r0 \
54+
php83-xmlwriter=8.3.15-r0 \
55+
php83-zip=8.3.15-r0 \
56+
&& ln -sf /usr/bin/php83 /usr/bin/php \
57+
&& mv /etc/php/php.ini /etc/php83/conf.d/zphp.ini \
58+
&& mv /etc/php/php-fpm.conf /etc/php83/php-fpm.d/zphp.conf
5859

5960
COPY --from=composer/composer:2.8.5-bin /composer /usr/local/bin/composer
6061

62+
# update
6163
RUN set -ex \
6264
&& if [ "$APP_TARGET" = "dev" ]; then \
63-
bash /devitools/.scripts/setup-dev.sh; \
64-
fi \
65-
# ---------- apply settings ------- \
65+
bash /devitools/.scripts/setup-dev.sh; \
66+
fi \
67+
# ---------- apply settings -------\
6668
&& bash /devitools/.scripts/setup.sh "$TIMEZONE" \
67-
# ---------- clear works ---------- \
68-
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man \
69-
&& echo -e "\033[42;37m Build Completed :).\033[0m\n"
69+
# ---------- clear works ----------\
70+
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man
7071

7172
EXPOSE 9501
7273

0 commit comments

Comments
 (0)