From e0abf029590bd7d6908c536919d6767ad9174ecc Mon Sep 17 00:00:00 2001
From: Angel Garcia <32900272+a-garcia-alvarez@users.noreply.github.com>
Date: Sun, 25 Oct 2020 23:36:06 +0100
Subject: [PATCH 1/5] Update Dockerfile (#1)

- new base for container
- force use of composer v1
- use jikan's source .env and modify it later
---
 jikan/Dockerfile | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/jikan/Dockerfile b/jikan/Dockerfile
index 6d1272e..8380ca5 100755
--- a/jikan/Dockerfile
+++ b/jikan/Dockerfile
@@ -1,19 +1,23 @@
-FROM php:7.3.11-apache-buster
+FROM php:7.3-apache
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 RUN apt-get update && apt-get install -y \
-    openssl \
+    curl \
     git \
     unzip \
- && 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 . \
- && composer install --prefer-dist --no-progress --no-suggest --classmap-authoritative  --no-interaction \
- && composer update jikan-me/jikan
+  && 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 \
+  && composer --version \
+  && a2enmod rewrite \
+  && service apache2 restart \
+  && git clone https://github.com/jikan-me/jikan-rest.git . \
+  && cp .env.dist .env \
+  && sed -i "s/GITHUB_REPORTING=.*/GITHUB_REPORTING=false/" .env \
+  && sed -i "s/REDIS_HOST=.*/REDIS_HOST=jikan-redis/" .env \
+  && composer install --prefer-dist --no-progress --classmap-authoritative  --no-interaction \
+  && composer update jikan-me/jikan
 
-ADD .env /run-jikan.sh ./
+ADD run-jikan.sh ./
 
-ENTRYPOINT ["./run-jikan.sh"]
\ No newline at end of file
+ENTRYPOINT ["./run-jikan.sh"]

From 479e08729b54b8000858d53388a9932ad6a0df33 Mon Sep 17 00:00:00 2001
From: Angel Garcia <32900272+a-garcia-alvarez@users.noreply.github.com>
Date: Sun, 25 Oct 2020 23:38:05 +0100
Subject: [PATCH 2/5] Update Dockerfile (#2)

- Change CACHE_ options as original project
---
 jikan/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jikan/Dockerfile b/jikan/Dockerfile
index 8380ca5..a26f8dc 100755
--- a/jikan/Dockerfile
+++ b/jikan/Dockerfile
@@ -15,6 +15,9 @@ RUN apt-get update && apt-get install -y \
   && 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 install --prefer-dist --no-progress --classmap-authoritative  --no-interaction \
   && composer update jikan-me/jikan
 

From de359242d0a7b7bbf333c0d0f50778b3a349982b Mon Sep 17 00:00:00 2001
From: Angel Garcia <32900272+a-garcia-alvarez@users.noreply.github.com>
Date: Sun, 25 Oct 2020 23:50:00 +0100
Subject: [PATCH 3/5] Delete .env, as we dont need it anymore (#3)

---
 jikan/.env | 38 --------------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100755 jikan/.env

diff --git a/jikan/.env b/jikan/.env
deleted file mode 100755
index 40bcc8f..0000000
--- a/jikan/.env
+++ /dev/null
@@ -1,38 +0,0 @@
-APP_ENV=production
-APP_DEBUG=true
-APP_KEY=
-APP_TIMEZONE=UTC
-APP_URL=http://localhost
-
-CACHE_DRIVER=file
-QUEUE_CONNECTION=redis
-
-CACHE_METHOD=legacy
-CACHE_DEFAULT_EXPIRE=3600
-CACHE_META_EXPIRE=300
-CACHE_USER_EXPIRE=300
-CACHE_404_EXPIRE=3600
-CACHE_SEARCH_EXPIRE=3600
-
-MICROCACHING=false
-MICROCACHING_EXPIRE=5
-
-QUEUE_DELAY_PER_JOB=5
-
-THROTTLE=false
-THROTTLE_DECAY_MINUTES=1
-THROTTLE_MAX_REQUESTS_PER_DECAY_MINUTES=60
-THROTTLE_MAX_REQUESTS_PER_SECOND=2
-
-SLAVE_INSTANCE=false
-SLAVE_KEY=
-SLAVE_CLIENT_IP_HEADER="X-Real-IP"
-SLAVE_KEY_HEADER="X-Master"
-
-REDIS_HOST=jikan-redis
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-GITHUB_REPORTING=false
-GITHUB_REST="jikan-me/jikan-rest"
-GITHUB_API="jikan-me/jikan
\ No newline at end of file

From a78bfb69d964e51af2f976dd6fde2fe35a0e1a3d Mon Sep 17 00:00:00 2001
From: Angel Garcia <32900272+a-garcia-alvarez@users.noreply.github.com>
Date: Sun, 25 Oct 2020 23:58:37 +0100
Subject: [PATCH 4/5] Update docker-compose.yml (#4)

-Change version to 2 so that we can use it with older versions
-Change restart condition of containers
---
 docker-compose.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 32cebd1..ace5e3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,6 @@
-version: "3.4"
+version: "2"
 
 services:
-
   jikan-rest-api:
     build:
       context: jikan
@@ -12,8 +11,8 @@ services:
       - "9001:80"
     networks:
       - default
-    restart: always
+    restart: unless-stopped
 
   jikan-redis:
     image: redis
-    restart: always
+    restart: unless-stopped

From 99d0c1f4e42bb839e446b65422c88d12fa511210 Mon Sep 17 00:00:00 2001
From: Angel <10299587+Darkangeel-hd@users.noreply.github.com>
Date: Fri, 30 Oct 2020 14:06:06 +0100
Subject: [PATCH 5/5] Update Dockerfile

Expose port 80
---
 jikan/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jikan/Dockerfile b/jikan/Dockerfile
index a26f8dc..4662082 100755
--- a/jikan/Dockerfile
+++ b/jikan/Dockerfile
@@ -24,3 +24,5 @@ RUN apt-get update && apt-get install -y \
 ADD run-jikan.sh ./
 
 ENTRYPOINT ["./run-jikan.sh"]
+
+EXPOSE 80