Add FestivAlgo
This commit is contained in:
parent
7d2afa5564
commit
f8250c9bbe
|
@ -1,9 +1,12 @@
|
|||
[submodule "src/SH4compatibilityTool"]
|
||||
path = src/SH4compatibilityTool
|
||||
url = gitea@gitea.planet-casio.com:Ziqumu/SH4compatibilityTool.git
|
||||
url = /Ziqumu/SH4compatibilityTool.git
|
||||
[submodule "src/G1rFxiTools"]
|
||||
path = src/G1rFxiTools
|
||||
url = gitea@gitea.planet-casio.com:Ziqumu/G1rFxiTools.git
|
||||
url = /Ziqumu/G1rFxiTools.git
|
||||
[submodule "src/EactMaker"]
|
||||
path = src/EactMaker
|
||||
url = gitea@gitea.planet-casio.com:Ziqumu/EactMaker.git
|
||||
url = /Ziqumu/EactMaker.git
|
||||
[submodule "src/FestivAlgo"]
|
||||
path = src/FestivAlgo
|
||||
url = /Ziqumu/FestivAlgo.git
|
||||
|
|
|
@ -11,6 +11,7 @@ services:
|
|||
- ./src/EactMaker:/www/EactMaker/
|
||||
- ./src/SH4compatibilityTool:/www/SH4compatibilityTool/
|
||||
- ./src/G1rFxiTools:/www/G1rFxiTools/
|
||||
- ./src/FestivAlgo:/www/FestivAlgo/
|
||||
- ./src/home:/www/home/
|
||||
|
||||
phpfpm-main:
|
||||
|
@ -26,5 +27,40 @@ services:
|
|||
- ./src/G1rFxiTools:/www/G1rFxiTools/
|
||||
- ./src/home:/www/home/
|
||||
|
||||
phpfpm-festivalgo:
|
||||
build:
|
||||
context: ./php-docker/
|
||||
args:
|
||||
PHP_VERSION: 7.4
|
||||
networks:
|
||||
- php-fpm
|
||||
# - mariadb-festivalgo
|
||||
volumes:
|
||||
- ./src/FestivAlgo:/www/FestivAlgo/
|
||||
|
||||
# mariadb-festivalgo:
|
||||
# image: mariadb
|
||||
# networks:
|
||||
# - mariadb-festivalgo
|
||||
# environment:
|
||||
# MYSQL_ROOT_PASSWORD: example2
|
||||
# MYSQL_USER: festivalgo
|
||||
# MYSQL_PASSWORD: example
|
||||
# MYSQL_DATABASE: festivalgo
|
||||
# volumes:
|
||||
# - ./src/FestivAlgo/database.sql:/docker-entrypoint-initdb.d/database.sql
|
||||
# - ./volumes/mariadb-festivalgo:/var/lib/mysql
|
||||
|
||||
# phpmyadmin-festivalgo:
|
||||
# image: phpmyadmin/phpmyadmin:5
|
||||
# networks:
|
||||
# - mariadb-festivalgo
|
||||
# ports:
|
||||
# - 8081:80
|
||||
# environment:
|
||||
# PMA_HOST: mariadb-festivalgo
|
||||
|
||||
|
||||
networks:
|
||||
php-fpm:
|
||||
php-fpm:
|
||||
# mariadb-festivalgo:
|
15
nginx.conf
15
nginx.conf
|
@ -8,6 +8,7 @@ server {
|
|||
rewrite ^/fxi2g1r/(.*)$ $scheme://$http_host/G1rFxiTools/FXItoG1R/$1 permanent;
|
||||
rewrite ^/G1MtoG1R/(.*)$ $scheme://$http_host/G1rFxiTools/G1MtoG1R/$1 permanent;
|
||||
rewrite ^/PicViewer/(.*)$ $scheme://$http_host/G1rFxiTools/PicViewer/$1 permanent;
|
||||
rewrite ^/festivalgo/(.*)$ $scheme://$http_host/FestivAlgo/$1 permanent;
|
||||
|
||||
# Tools homepage
|
||||
rewrite ^(/_system/.*)$ /home/$1;
|
||||
|
@ -24,11 +25,19 @@ server {
|
|||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
}
|
||||
|
||||
# Forward to the festivalgo php-fpm container
|
||||
location ~ ^/FestivAlgo/.*\.php$ {
|
||||
try_files $uri =404;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass phpfpm-festivalgo:9000;
|
||||
fastcgi_index index.php;
|
||||
include fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
}
|
||||
|
||||
# If we still have php there, that's an error!
|
||||
location ~ \.php$ {
|
||||
return 500;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# TODO add gd to php
|
|
@ -1,8 +1,13 @@
|
|||
ARG PHP_VERSION
|
||||
FROM php:${PHP_VERSION}-fpm
|
||||
|
||||
# Install GD extension
|
||||
RUN apt-get update && apt-get install -y \
|
||||
libfreetype6-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libpng-dev \
|
||||
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
|
||||
&& docker-php-ext-install -j$(nproc) gd
|
||||
&& docker-php-ext-install -j$(nproc) gd
|
||||
|
||||
# Install PDO mysql extension
|
||||
RUN docker-php-ext-install pdo pdo_mysql
|
|
@ -0,0 +1 @@
|
|||
Subproject commit b640a41bfeacb86fff81fce5aebf5d07c5a18d58
|
Loading…
Reference in New Issue