From debe197a6be56f5a8ce383c8866fa70fa2c112a4 Mon Sep 17 00:00:00 2001
From: sunjay <9930542+zunjae@users.noreply.github.com>
Date: Thu, 21 Nov 2019 17:26:27 +0100
Subject: [PATCH] works again

---
 docker-compose.yml | 10 ++++------
 jikan/.env         | 15 +++++++++------
 jikan/Dockerfile   |  5 +++--
 run.sh             |  3 +++
 4 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 run.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index ce81892..6933b0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,20 +2,18 @@ version: "3.4"
 
 services:
 
-  jikan-rest:
+  jikan-rest-api:
     build:
       context: jikan
       dockerfile: Dockerfile
     depends_on:
-      - jikan-redis
+      - jikan-redis-db
     ports:
       - "9001:80"
     networks:
       - default
     restart: always
-    container_name: jikan-rest-api
 
-  jikan-redis:
-    image: redis:5.0.6-buster
+  jikan-redis-db:
+    image: redis
     restart: always
-    container_name: jikan-rest-redis
diff --git a/jikan/.env b/jikan/.env
index 57ac2d4..f17d34b 100755
--- a/jikan/.env
+++ b/jikan/.env
@@ -4,8 +4,8 @@ APP_KEY=
 APP_TIMEZONE=UTC
 APP_URL=http://localhost
 
-CACHE_DRIVER=redis
-QUEUE_DRIVER=redis
+CACHE_DRIVER=file
+QUEUE_CONNECTION=redis
 
 CACHE_METHOD=legacy
 CACHE_DEFAULT_EXPIRE=86400
@@ -14,22 +14,25 @@ CACHE_USER_EXPIRE=300
 CACHE_404_EXPIRE=604800
 CACHE_SEARCH_EXPIRE=432000
 
+MICROCACHING=false
+MICROCACHING_EXPIRE=5
+
 QUEUE_DELAY_PER_JOB=5
 
 THROTTLE=false
 THROTTLE_DECAY_MINUTES=1
-THROTTLE_MAX_PER_DECAY_MINUTES=30
-THROTTLE_MAX_PER_CONCURRENCY=2
+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_HOST=jikan-redis-db
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 GITHUB_REPORTING=false
 GITHUB_REST="jikan-me/jikan-rest"
-GITHUB_API="jikan-me/jikan
+GITHUB_API="jikan-me/jikan
\ No newline at end of file
diff --git a/jikan/Dockerfile b/jikan/Dockerfile
index 87e9d3c..67299fe 100755
--- a/jikan/Dockerfile
+++ b/jikan/Dockerfile
@@ -11,8 +11,9 @@ RUN apt-get update && apt-get install -y \
  && 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 install --prefer-dist --no-progress --no-suggest --classmap-authoritative  --no-interaction \
+ && git checkout 3e311808a8f6f872c1649f56f616dfeff4c58a06
 
 ADD .env /run-jikan.sh ./
 
-ENTRYPOINT ["./run-jikan.sh"]
+ENTRYPOINT ["./run-jikan.sh"]
\ No newline at end of file
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..2158a18
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,3 @@
+docker-compose stop
+docker-compose build
+docker-compose up
\ No newline at end of file