From 422f2073c59953b3f60ac74407776d2aa75bf738 Mon Sep 17 00:00:00 2001
From: Aurelien Labate <aurelien@labate.me>
Date: Wed, 1 Jan 2020 17:52:55 +0100
Subject: [PATCH] Add spritecoder

---
 .gitmodules              | 11 +++++++----
 docker-compose.yml       |  4 +++-
 nginx.conf               |  2 +-
 php-docker/Dockerfile    |  7 ++++++-
 php-docker/entrypoint.sh | 13 +++++++++++++
 src/SpriteCoder          |  1 +
 6 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100755 php-docker/entrypoint.sh
 create mode 160000 src/SpriteCoder

diff --git a/.gitmodules b/.gitmodules
index 33611dc..331a5cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,15 @@
 [submodule "src/SH4compatibilityTool"]
 	path = src/SH4compatibilityTool
-	url = ../SH4compatibilityTool.git
+	url = ../../Ziqumu/SH4compatibilityTool.git
 [submodule "src/G1rFxiTools"]
 	path = src/G1rFxiTools
-	url = ../G1rFxiTools.git
+	url = ../../Ziqumu/G1rFxiTools.git
 [submodule "src/EactMaker"]
 	path = src/EactMaker
-	url = ../EactMaker.git
+	url = ../../Ziqumu/EactMaker.git
 [submodule "src/FestivAlgo"]
 	path = src/FestivAlgo
-	url = ../FestivAlgo.git
+	url = ../../Ziqumu/FestivAlgo.git
+[submodule "src/SpriteCoder"]
+	path = src/SpriteCoder
+	url = ../../Smashmaster/SpriteCoder.git
diff --git a/docker-compose.yml b/docker-compose.yml
index 4dd4328..5cb0bcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - ./src/SH4compatibilityTool:/www/SH4compatibilityTool/
       - ./src/G1rFxiTools:/www/G1rFxiTools/
       - ./src/FestivAlgo:/www/FestivAlgo/
+      - ./src/SpriteCoder:/www/SpriteCoder/
       - ./src/home:/www/home/
 
   phpfpm-main:
@@ -25,9 +26,10 @@ services:
       - ./src/EactMaker:/www/EactMaker/
       - ./src/SH4compatibilityTool:/www/SH4compatibilityTool/
       - ./src/G1rFxiTools:/www/G1rFxiTools/
+      - ./src/SpriteCoder:/www/SpriteCoder/
       - ./src/home:/www/home/
 
-  phpfpm-festivalgo:
+  phpfpm-festivalgo: 
     build:
       context: ./php-docker/
       args:
diff --git a/nginx.conf b/nginx.conf
index 9d7461d..be01993 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -15,7 +15,7 @@ server {
     rewrite ^/?$ /home/index.php;
 
     # Forward to the main php-fpm container
-    location ~ ^/(home|EactMaker|SH4compatibilityTool|G1rFxiTools)/.*\.php$ {
+    location ~ ^/(home|EactMaker|SH4compatibilityTool|G1rFxiTools|SpriteCoder)/.*\.php$ {
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass phpfpm-main:9000;
diff --git a/php-docker/Dockerfile b/php-docker/Dockerfile
index e71b5d7..90084c0 100644
--- a/php-docker/Dockerfile
+++ b/php-docker/Dockerfile
@@ -10,4 +10,9 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-install -j$(nproc) gd
 
 # Install PDO mysql extension
-RUN docker-php-ext-install pdo pdo_mysql
\ No newline at end of file
+RUN docker-php-ext-install pdo pdo_mysql
+
+# Set entrypoint
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "php-fpm" ]
\ No newline at end of file
diff --git a/php-docker/entrypoint.sh b/php-docker/entrypoint.sh
new file mode 100755
index 0000000..685cfea
--- /dev/null
+++ b/php-docker/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# Set the whole project in read-only mode
+chmod -R a=rX /www/
+# Per project exceptions:
+# SpriteCoder
+if [ -d /www/SpriteCoder ] ; then
+    mkdir -p /www/SpriteCoder/upload
+    chmod a+w /www/SpriteCoder/upload
+fi
+
+exec docker-php-entrypoint "$@"
\ No newline at end of file
diff --git a/src/SpriteCoder b/src/SpriteCoder
new file mode 160000
index 0000000..908059c
--- /dev/null
+++ b/src/SpriteCoder
@@ -0,0 +1 @@
+Subproject commit 908059c17fb30d4eb2cfadb1cc0075dc122be4ec