mirror of
https://github.com/danog/MadelineProto.git
synced 2024-11-30 06:59:01 +01:00
Cleanup
This commit is contained in:
parent
d732b51508
commit
c26c77045a
@ -27,4 +27,4 @@ steps:
|
||||
- push
|
||||
commands:
|
||||
- apk add bash
|
||||
#- tests/test.sh cs
|
||||
- tests/test.sh cs
|
||||
@ -53,7 +53,7 @@ steps:
|
||||
- push
|
||||
commands:
|
||||
- apk add bash
|
||||
#- tests/test.sh psalm
|
||||
- tests/test.sh psalm
|
||||
|
||||
handshake:
|
||||
group: test
|
||||
|
||||
@ -20,7 +20,7 @@ for f in 192.168.1.30 192.168.69.236 192.168.69.233 192.168.69.207 192.168.69.13
|
||||
done
|
||||
|
||||
arches=""
|
||||
#arches="arm64"
|
||||
arches="arm64"
|
||||
if [ $has_x86 -eq 1 ]; then
|
||||
arches="$arches amd64"
|
||||
fi
|
||||
|
||||
@ -1,277 +1,4 @@
|
||||
FROM alpine:3.19
|
||||
|
||||
# dependencies required for running "phpize"
|
||||
# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
|
||||
ENV PHPIZE_DEPS \
|
||||
autoconf \
|
||||
dpkg-dev dpkg \
|
||||
file \
|
||||
g++ \
|
||||
clang \
|
||||
libc-dev \
|
||||
make \
|
||||
pkgconf \
|
||||
re2c
|
||||
|
||||
# persistent / runtime deps
|
||||
RUN apk add --no-cache \
|
||||
ca-certificates \
|
||||
curl \
|
||||
openssl \
|
||||
tar \
|
||||
xz
|
||||
|
||||
# ensure www-data user exists
|
||||
RUN set -eux; \
|
||||
adduser -u 82 -D -S -G www-data www-data
|
||||
# 82 is the standard uid/gid for "www-data" in Alpine
|
||||
# https://git.alpinelinux.org/aports/tree/main/apache2/apache2.pre-install?h=3.14-stable
|
||||
# https://git.alpinelinux.org/aports/tree/main/lighttpd/lighttpd.pre-install?h=3.14-stable
|
||||
# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install?h=3.14-stable
|
||||
|
||||
ENV PHP_INI_DIR /usr/local/etc/php
|
||||
RUN set -eux; \
|
||||
mkdir -p "$PHP_INI_DIR/conf.d"; \
|
||||
# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
|
||||
[ ! -d /var/www/html ]; \
|
||||
mkdir -p /var/www/html; \
|
||||
chown www-data:www-data /var/www/html; \
|
||||
chmod 1777 /var/www/html
|
||||
|
||||
# Apply stack smash protection to functions using local buffers and alloca()
|
||||
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
|
||||
# Enable optimization (-O2)
|
||||
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
|
||||
# https://github.com/docker-library/php/issues/272
|
||||
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
|
||||
|
||||
ENV CC=clang
|
||||
ENV CXX=clang++
|
||||
|
||||
ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
|
||||
|
||||
ENV PHP_VERSION 8.3.1
|
||||
ENV PHP_URL="https://www.php.net/distributions/php-8.3.1.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.1.tar.xz.asc"
|
||||
ENV PHP_SHA256="56445b1771b2ba5b7573453f9e8a9451e2d810b1741a352fa05259733b1e9758"
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
apk add --no-cache --virtual .fetch-deps gnupg; \
|
||||
\
|
||||
mkdir -p /usr/src; \
|
||||
cd /usr/src; \
|
||||
\
|
||||
curl -fsSL -o php.tar.xz "$PHP_URL"; \
|
||||
\
|
||||
if [ -n "$PHP_SHA256" ]; then \
|
||||
echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
|
||||
fi; \
|
||||
\
|
||||
if [ -n "$PHP_ASC_URL" ]; then \
|
||||
curl -fsSL -o php.tar.xz.asc "$PHP_ASC_URL"; \
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
done; \
|
||||
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
fi; \
|
||||
\
|
||||
apk del --no-network .fetch-deps
|
||||
|
||||
COPY tests/dockerfiles/docker-php-source /usr/local/bin/
|
||||
COPY tests/dockerfiles/a.patch /a.patch
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache --virtual .build-deps \
|
||||
$PHPIZE_DEPS \
|
||||
argon2-dev \
|
||||
coreutils \
|
||||
curl-dev \
|
||||
gnu-libiconv-dev \
|
||||
libsodium-dev \
|
||||
libxml2-dev \
|
||||
linux-headers \
|
||||
oniguruma-dev \
|
||||
openssl-dev \
|
||||
readline-dev \
|
||||
sqlite-dev \
|
||||
libffi-dev \
|
||||
gmp-dev \
|
||||
icu-dev \
|
||||
libzip-dev patch compiler-rt \
|
||||
; \
|
||||
\
|
||||
# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
|
||||
rm -vf /usr/include/iconv.h; \
|
||||
\
|
||||
export \
|
||||
# https://github.com/php/php-src/blob/d6299206dd828382753453befd1b915491b741c6/configure.ac#L1496-L1511
|
||||
PHP_BUILD_PROVIDER='https://github.com/docker-library/php' \
|
||||
PHP_UNAME='Linux - Docker' \
|
||||
; \
|
||||
docker-php-source extract; \
|
||||
cd /usr/src/php; \
|
||||
patch -p1 < /a.patch; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--with-config-file-path="$PHP_INI_DIR" \
|
||||
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
|
||||
\
|
||||
# make sure invalid --configure-flags are fatal errors instead of just warnings
|
||||
--enable-option-checking=fatal \
|
||||
\
|
||||
# https://github.com/docker-library/php/issues/439
|
||||
--with-mhash \
|
||||
\
|
||||
# https://github.com/docker-library/php/issues/822
|
||||
--with-pic \
|
||||
\
|
||||
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
|
||||
--enable-ftp \
|
||||
# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
|
||||
--enable-mbstring \
|
||||
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
|
||||
--enable-mysqlnd \
|
||||
# https://wiki.php.net/rfc/argon2_password_hash
|
||||
--with-password-argon2 \
|
||||
# https://wiki.php.net/rfc/libsodium
|
||||
--with-sodium=shared \
|
||||
# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109)
|
||||
--with-pdo-sqlite=/usr \
|
||||
--with-sqlite3=/usr \
|
||||
\
|
||||
--with-curl \
|
||||
--with-iconv=/usr \
|
||||
--with-openssl \
|
||||
--with-readline \
|
||||
--with-zlib \
|
||||
\
|
||||
# https://github.com/bwoebi/phpdbg-docs/issues/1#issuecomment-163872806 ("phpdbg is primarily a CLI debugger, and is not suitable for debugging an fpm stack.")
|
||||
--disable-phpdbg \
|
||||
\
|
||||
# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
|
||||
--with-pear \
|
||||
\
|
||||
# bundled pcre does not support JIT on s390x
|
||||
# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
|
||||
$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
|
||||
\
|
||||
--disable-cgi \
|
||||
\
|
||||
--enable-debug \
|
||||
--enable-address-sanitizer \
|
||||
--enable-fpm \
|
||||
--with-ffi \
|
||||
--enable-pcntl \
|
||||
--enable-intl \
|
||||
--with-pdo-mysql \
|
||||
--with-gmp \
|
||||
--with-zip \
|
||||
--with-fpm-user=www-data \
|
||||
--with-fpm-group=www-data \
|
||||
; \
|
||||
make -j "$(nproc)"; \
|
||||
find -type f -name '*.a' -delete; \
|
||||
make install; \
|
||||
make clean; \
|
||||
\
|
||||
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
|
||||
cp -v php.ini-* "$PHP_INI_DIR/"; \
|
||||
\
|
||||
cd /; \
|
||||
docker-php-source delete; \
|
||||
\
|
||||
runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)"; \
|
||||
apk add --no-cache $runDeps; \
|
||||
\
|
||||
apk del --no-network .build-deps; \
|
||||
\
|
||||
# update pecl channel definitions https://github.com/docker-library/php/issues/443
|
||||
pecl update-channels; \
|
||||
rm -rf /tmp/pear ~/.pearrc; \
|
||||
\
|
||||
# smoke test
|
||||
php --version
|
||||
|
||||
COPY tests/dockerfiles/docker-php-ext-* tests/dockerfiles/docker-php-entrypoint /usr/local/bin/
|
||||
|
||||
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
|
||||
RUN docker-php-ext-enable sodium
|
||||
|
||||
ENTRYPOINT ["docker-php-entrypoint"]
|
||||
WORKDIR /var/www/html
|
||||
|
||||
RUN set -eux; \
|
||||
cd /usr/local/etc; \
|
||||
if [ -d php-fpm.d ]; then \
|
||||
# for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
|
||||
sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
|
||||
cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
|
||||
else \
|
||||
# PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
|
||||
mkdir php-fpm.d; \
|
||||
cp php-fpm.conf.default php-fpm.d/www.conf; \
|
||||
{ \
|
||||
echo '[global]'; \
|
||||
echo 'include=etc/php-fpm.d/*.conf'; \
|
||||
} | tee php-fpm.conf; \
|
||||
fi; \
|
||||
{ \
|
||||
echo '[global]'; \
|
||||
echo 'error_log = /proc/self/fd/2'; \
|
||||
echo; echo '; https://github.com/docker-library/php/pull/725#issuecomment-443540114'; echo 'log_limit = 8192'; \
|
||||
echo; \
|
||||
echo '[www]'; \
|
||||
echo '; php-fpm closes STDOUT on startup, so sending logs to /proc/self/fd/1 does not work.'; \
|
||||
echo '; https://bugs.php.net/bug.php?id=73886'; \
|
||||
echo 'access.log = /proc/self/fd/2'; \
|
||||
echo; \
|
||||
echo 'clear_env = no'; \
|
||||
echo; \
|
||||
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
|
||||
echo 'catch_workers_output = yes'; \
|
||||
echo 'decorate_workers_output = no'; \
|
||||
} | tee php-fpm.d/docker.conf; \
|
||||
{ \
|
||||
echo '[global]'; \
|
||||
echo 'daemonize = no'; \
|
||||
echo; \
|
||||
echo '[www]'; \
|
||||
echo 'listen = 9000'; \
|
||||
} | tee php-fpm.d/zz-docker.conf; \
|
||||
mkdir -p "$PHP_INI_DIR/conf.d"; \
|
||||
{ \
|
||||
echo '; https://github.com/docker-library/php/issues/878#issuecomment-938595965'; \
|
||||
echo 'fastcgi.logging = Off'; \
|
||||
} > "$PHP_INI_DIR/conf.d/docker-fpm.ini"
|
||||
|
||||
# Override stop signal to stop process gracefully
|
||||
# https://github.com/php/php-src/blob/17baa87faddc2550def3ae7314236826bc1b1398/sapi/fpm/php-fpm.8.in#L163
|
||||
STOPSIGNAL SIGQUIT
|
||||
|
||||
EXPOSE 9000
|
||||
|
||||
ENV CFLAGS="-g -O0"
|
||||
ENV CXXFLAGS="-g -O0"
|
||||
|
||||
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
|
||||
|
||||
RUN chmod +x /usr/local/bin/install-php-extensions && \
|
||||
install-php-extensions uv-beta pq memprof igbinary gd && \
|
||||
rm /usr/local/bin/install-php-extensions
|
||||
|
||||
RUN apk add --no-cache ffmpeg nghttp2 jemalloc
|
||||
|
||||
ENV CFLAGS="-g -O0 -fsanitize=address"
|
||||
ENV CXXFLAGS="-g -O0 -fsanitize=address"
|
||||
FROM php:8.3-fpm-alpine
|
||||
|
||||
RUN apk add --no-cache make g++ && \
|
||||
curl -sSLf https://github.com/danog/PrimeModule-ext/archive/refs/tags/2.0.tar.gz | tar -xz && \
|
||||
@ -282,16 +9,18 @@ RUN apk add --no-cache make g++ && \
|
||||
rm -r PrimeModule-ext-2.0 && \
|
||||
apk del make g++
|
||||
|
||||
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
|
||||
|
||||
RUN chmod +x /usr/local/bin/install-php-extensions && \
|
||||
install-php-extensions pcntl uv-beta ffi pq memprof intl gmp mbstring pdo_mysql xml dom iconv zip opcache igbinary gd && \
|
||||
rm /usr/local/bin/install-php-extensions
|
||||
|
||||
RUN apk add --no-cache ffmpeg nghttp2 jemalloc
|
||||
|
||||
ENV LD_PRELOAD=libjemalloc.so.2
|
||||
|
||||
ADD ./tests/dockerfiles/php.ini /usr/local/etc/php/php.ini
|
||||
|
||||
ADD ./tests/jit.php /jit.php
|
||||
|
||||
RUN php /jit.php && rm /jit.php
|
||||
|
||||
RUN apk add llvm
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
CMD ["php", "/app/bot.php"]
|
||||
|
||||
@ -5,7 +5,7 @@ display_startup_errors = On
|
||||
|
||||
ffi.enable=0
|
||||
|
||||
;zend_extension=opcache
|
||||
zend_extension=opcache
|
||||
|
||||
[opcache]
|
||||
opcache.memory_consumption=256M
|
||||
|
||||
@ -8,13 +8,13 @@ foreach (['pcntl', 'uv', 'ffi', 'pq', 'memprof', 'intl', 'gmp', 'mbstring', 'pdo
|
||||
}
|
||||
}
|
||||
|
||||
/*$status = opcache_get_status();
|
||||
$status = opcache_get_status();
|
||||
var_dump($status);
|
||||
|
||||
if (!$status["jit"]["on"]) {
|
||||
echo "JIT is not enabled!".PHP_EOL;
|
||||
die(1);
|
||||
}*/
|
||||
}
|
||||
|
||||
if (!$ok) {
|
||||
die(1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user