From 8bb7257d0bc739ba9cf9ef9853c44be39403c139 Mon Sep 17 00:00:00 2001
From: Angel Garcia <a-garcia-alvarez@users.noreply.github.com>
Date: Thu, 6 Oct 2022 15:50:37 +0200
Subject: [PATCH] Update project to make it work with latest v3

- updated php version
- changed artisan config (must be reviwed later)
- changed internal port
- some other fast made things that should be fixed later
---
 docker-compose.yml |  2 +-
 jikan/Dockerfile   | 10 ++++++----
 jikan/run-jikan.sh |  3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ace5e3f..e6dc6c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     depends_on:
       - jikan-redis
     ports:
-      - "9001:80"
+      - "9080:8080"
     networks:
       - default
     restart: unless-stopped
diff --git a/jikan/Dockerfile b/jikan/Dockerfile
index 4662082..5ff1307 100755
--- a/jikan/Dockerfile
+++ b/jikan/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
@@ -7,17 +7,19 @@ RUN apt-get update && apt-get install -y \
     git \
     unzip \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
-  && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --version=1.10.16 \
+  && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
   && composer --version \
   && a2enmod rewrite \
   && service apache2 restart \
-  && git clone https://github.com/jikan-me/jikan-rest.git . \
+  && git clone https://github.com/jikan-me/jikan-rest.git -b v3 . \
+  && git checkout v3 \
   && cp .env.dist .env \
   && sed -i "s/GITHUB_REPORTING=.*/GITHUB_REPORTING=false/" .env \
   && sed -i "s/REDIS_HOST=.*/REDIS_HOST=jikan-redis/" .env \
   && sed -i "s/CACHE_DEFAULT_EXPIRE=.*/CACHE_DEFAULT_EXPIRE=3600/" .env \
   && sed -i "s/CACHE_404_EXPIRE=.*/CACHE_404_EXPIRE=3600/" .env \
   && sed -i "s/CACHE_SEARCH_EXPIRE=.*/CACHE_SEARCH_EXPIRE=3600/" .env \
+  && composer config --no-plugins allow-plugins true \
   && composer install --prefer-dist --no-progress --classmap-authoritative  --no-interaction \
   && composer update jikan-me/jikan
 
@@ -25,4 +27,4 @@ ADD run-jikan.sh ./
 
 ENTRYPOINT ["./run-jikan.sh"]
 
-EXPOSE 80
+EXPOSE 8080
diff --git a/jikan/run-jikan.sh b/jikan/run-jikan.sh
index 02468ed..1a3d891 100755
--- a/jikan/run-jikan.sh
+++ b/jikan/run-jikan.sh
@@ -3,4 +3,5 @@
 chmod -R a+w storage/
 
 # php:7.3.14-apache-buster ENTRYPOINT
-docker-php-entrypoint apache2-foreground
\ No newline at end of file
+#docker-php-entrypoint apache2-foreground
+php artisan serve --host 0.0.0.0 --port=8080