php8(2) #2

Manually merged
letrhee merged 3 commits from php8 into master 2021-08-22 00:46:58 +09:00
6 changed files with 16 additions and 6 deletions
+4 -2
View File
@@ -1,4 +1,4 @@
FROM php:7.4-fpm-buster
FROM php:8.0-fpm-buster
#debian
ENV LC_ALL=C.UTF-8
@@ -30,7 +30,6 @@ RUN mkdir -p /var/www/html/; \
COPY entrypoint.sh /usr/local/bin/
COPY id_ecdsa known_hosts /var/www/.ssh/
COPY sam_conf.ini /usr/local/etc/php/conf.d/sam_conf.ini
VOLUME /var/www/html
ARG UID=33
@@ -44,6 +43,7 @@ RUN if [ "$UID" != 33 ]; then \
fi; \
echo $UID > /var/tmp.txt ; \
chmod +x /usr/local/bin/entrypoint.sh; \
mkdir -p /var/www/opcache; \
chown -R www-data:www-data /var/www; \
chmod -R g=u /var/www; \
mkdir -p /var/www/.ssh; \
@@ -51,5 +51,7 @@ RUN if [ "$UID" != 33 ]; then \
chmod 700 /var/www/.ssh; \
chmod 600 /var/www/.ssh/*;
COPY sam_conf.ini /usr/local/etc/php/conf.d/sam_conf.ini
ENTRYPOINT ["entrypoint.sh"]
CMD ["php-fpm"]
+1 -1
View File
@@ -14,7 +14,7 @@ if [ ! -f "$samRoot/index.php" ]; then
gosu www-data git clone $gameGitPath $samRoot
fi
if [ $HIDCHE_IMAGE_USE_INTERNAL = "yes" ] && [ ! -d "$imageRoot" ]; then
if [ "$HIDCHE_IMAGE_USE_INTERNAL" = "yes" ] && [ ! -d "$imageRoot" ]; then
if [[ "$imgGitPath" =~ ^ssh ]]; then
query=`echo "<?php \\\$a=parse_url('$imgGitPath');echo join(' ', [\\\$a['port']?'-p '.\\\$a['port']:'',\\\$a['host']]);" | php`
gosu www-data ssh-keyscan $query >> /var/www/.ssh/known_hosts 2>/dev/null;
+2 -2
View File
@@ -1,2 +1,2 @@
|1|A5U4hctGnWs6lG/lyQwxoQeLNR4=|Duy+Eo8DZKf1YpzqKfDZBWm0my4= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGqnjXhynKLrO2zcAqk/q9kIg22UZLzRMuV+wg9E8q43KN9IFgO+qAKvzayPiel4cG7eoZyHm2qWFqqbfsVLmtgEcr8CR1LM5URm5B+lI14gLYk2oaipsue67Hl0N4aC9W977Yh08JfDZ9k9rdZOl457O0Wbbc6xpHj3qgCdppvHWqmMFBI4d/lsXINHcOdmfxGgGXO8OaRPl7NM4Sxc4TYh7DvXwsJEU/e/oVz55T5Gpu/JFzWjyqJFgT7cJKAtzPHlbKclWKMpUq0vr8b+r6OyCGLy7LepCmTJO9KAvezHrquYpHLbDik5N1XGQSqIWmwPV/FTyprFtL/He4gpCN
|1|TRfzDehLxid6zvmGGZJxA+dzzpw=|6ZJ8ub5vm0zxBv8JGB8cNZk6QIM= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGqnjXhynKLrO2zcAqk/q9kIg22UZLzRMuV+wg9E8q43KN9IFgO+qAKvzayPiel4cG7eoZyHm2qWFqqbfsVLmtgEcr8CR1LM5URm5B+lI14gLYk2oaipsue67Hl0N4aC9W977Yh08JfDZ9k9rdZOl457O0Wbbc6xpHj3qgCdppvHWqmMFBI4d/lsXINHcOdmfxGgGXO8OaRPl7NM4Sxc4TYh7DvXwsJEU/e/oVz55T5Gpu/JFzWjyqJFgT7cJKAtzPHlbKclWKMpUq0vr8b+r6OyCGLy7LepCmTJO9KAvezHrquYpHLbDik5N1XGQSqIWmwPV/FTyprFtL/He4gpCN
|1|F5PQuvYtsnOvlFTYbXrlNmbTc0k=|+Vc0k0gtOlfd4YXjch2Q6fKhVYc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhcLxpNyRN/3Re7jLUooHW9UYvlWjgp7OUCUFBMDqKnc/JHjiPV1qA1aKcdc5RYEir0dxSj8EAywNV5AakGlcuLibHjP8m/DK4tjAs6EuNGhbqOn4H5M/mEwJHvBPS06BlsMpFG69E9v+E6DQ27fc+AN84LNkG3C5BUSIOFDlUJVS2GoldxxIEXD2WopFBqfffei8ze7sBNbJ/LZ1O4N3NRLWKAalUbJT/L+UVIL3uNOuEzDcNyra+VvfFamwV55X323+QxXYBY3EVnAT4+JyuEp7cxlAHEjC68c2iJ5vWXlCjxXCA6EN7i/UPDD7+bP8KD/9vd9LkEpfTcN22Sns3
|1|937xmet4gCqPCNCXV+/5ob1kaT4=|dnau7j/74oG1D6ETIy550OddgrI= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhcLxpNyRN/3Re7jLUooHW9UYvlWjgp7OUCUFBMDqKnc/JHjiPV1qA1aKcdc5RYEir0dxSj8EAywNV5AakGlcuLibHjP8m/DK4tjAs6EuNGhbqOn4H5M/mEwJHvBPS06BlsMpFG69E9v+E6DQ27fc+AN84LNkG3C5BUSIOFDlUJVS2GoldxxIEXD2WopFBqfffei8ze7sBNbJ/LZ1O4N3NRLWKAalUbJT/L+UVIL3uNOuEzDcNyra+VvfFamwV55X323+QxXYBY3EVnAT4+JyuEp7cxlAHEjC68c2iJ5vWXlCjxXCA6EN7i/UPDD7+bP8KD/9vd9LkEpfTcN22Sns3
+2
View File
@@ -7,9 +7,11 @@ memory_limit=512M
apc.enable_cli=1
opcache.enable=1
opcache.jit_buffer_size=100M
opcache.interned_strings_buffer=8
opcache.max_accelerated_files=10000
opcache.validate_timestamps=on
opcache.memory_consumption=128
opcache.save_comments=1
opcache.revalidate_freq=1
opcache.file_cache="/var/www/opcache"
+2 -1
View File
@@ -41,7 +41,6 @@ RUN { \
mkdir -p /var/www/.ssh;
COPY entrypoint.sh /usr/local/bin/
COPY sam_conf.ini /usr/local/etc/php/conf.d/sam_conf.ini
VOLUME /var/www/board
@@ -60,5 +59,7 @@ RUN if [ "$UID" != 33 ]; then \
mkdir -p /var/www/.ssh; \
chown www-data:www-data /var/www/.ssh;
COPY sam_conf.ini /usr/local/etc/php/conf.d/sam_conf.ini
ENTRYPOINT ["entrypoint.sh"]
CMD ["php-fpm"]
+5
View File
@@ -25,6 +25,11 @@ location ~ ^/board/(.+)\.min\.(css|js)$ {
try_files $uri $uri/ /board/$1.$2;
}
# fix download URL when other directives for static files are present
location ~ ^/board/files/download/ {
try_files $uri $uri/ /board/index.php$is_args$args;
}
# all other short URLs
location /board/ {
try_files $uri $uri/ /board/index.php$is_args$args;