From 5af59498ba602e809233b7ba4439a08807183ebb Mon Sep 17 00:00:00 2001 From: letrhee Date: Sun, 21 Feb 2021 15:47:07 +0900 Subject: [PATCH 1/3] php8 --- hidche/app/Dockerfile | 6 ++++-- hidche/app/entrypoint.sh | 2 +- hidche/app/sam_conf.ini | 2 ++ hidche/board/Dockerfile | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hidche/app/Dockerfile b/hidche/app/Dockerfile index 0a6b79f..6acf35e 100644 --- a/hidche/app/Dockerfile +++ b/hidche/app/Dockerfile @@ -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"] \ No newline at end of file diff --git a/hidche/app/entrypoint.sh b/hidche/app/entrypoint.sh index 07b5ac8..0d7f903 100755 --- a/hidche/app/entrypoint.sh +++ b/hidche/app/entrypoint.sh @@ -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 "> /var/www/.ssh/known_hosts 2>/dev/null; diff --git a/hidche/app/sam_conf.ini b/hidche/app/sam_conf.ini index f396947..8a47e36 100644 --- a/hidche/app/sam_conf.ini +++ b/hidche/app/sam_conf.ini @@ -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" diff --git a/hidche/board/Dockerfile b/hidche/board/Dockerfile index 9452a2b..ec58178 100644 --- a/hidche/board/Dockerfile +++ b/hidche/board/Dockerfile @@ -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"] \ No newline at end of file From c3a8b17a401499353c5a5ec70ae83e82933dc402 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 19 Aug 2021 14:45:03 +0900 Subject: [PATCH 2/3] =?UTF-8?q?rhymix=202.0=20conf=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hidche/web/rhymix.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hidche/web/rhymix.conf b/hidche/web/rhymix.conf index 245608d..fe2c105 100644 --- a/hidche/web/rhymix.conf +++ b/hidche/web/rhymix.conf @@ -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; From 2d8fd1bcb010859acf2ae44c755f6855eaabe586 Mon Sep 17 00:00:00 2001 From: letrhee Date: Sat, 21 Aug 2021 01:03:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?known=5Fhosts=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hidche/app/known_hosts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hidche/app/known_hosts b/hidche/app/known_hosts index 5d01289..7098c25 100644 --- a/hidche/app/known_hosts +++ b/hidche/app/known_hosts @@ -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 \ No newline at end of file +|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 \ No newline at end of file