diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bf8b380..32cebd1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: - jikan-rest: + jikan-rest-api: build: context: jikan dockerfile: Dockerfile @@ -15,9 +15,5 @@ services: restart: always jikan-redis: - image: redis:rc-alpine - ports: - - "6379:6379" - networks: - - default + image: redis restart: always diff --git a/jikan/.env b/jikan/.env index cc9d453..2f64966 100755 --- a/jikan/.env +++ b/jikan/.env @@ -1,4 +1,4 @@ -APP_ENV=production +APP_ENV=testing APP_DEBUG=true APP_KEY= APP_TIMEZONE=UTC @@ -8,11 +8,11 @@ CACHE_DRIVER=file QUEUE_CONNECTION=redis CACHE_METHOD=legacy -CACHE_DEFAULT_EXPIRE=600 +CACHE_DEFAULT_EXPIRE=86400 CACHE_META_EXPIRE=300 CACHE_USER_EXPIRE=300 -CACHE_404_EXPIRE=600 -CACHE_SEARCH_EXPIRE=600 +CACHE_404_EXPIRE=604800 +CACHE_SEARCH_EXPIRE=432000 MICROCACHING=false MICROCACHING_EXPIRE=5 @@ -33,6 +33,6 @@ REDIS_HOST=jikan-redis REDIS_PASSWORD=null REDIS_PORT=6379 -GITHUB_REPORTING=false +GITHUB_REPORTING=true GITHUB_REST="jikan-me/jikan-rest" GITHUB_API="jikan-me/jikan \ No newline at end of file diff --git a/jikan/Dockerfile b/jikan/Dockerfile index 42d2f2a..5479378 100755 --- a/jikan/Dockerfile +++ b/jikan/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3.14-apache-buster +FROM php:7.3.11-apache-buster ENV COMPOSER_ALLOW_SUPERUSER 1 @@ -11,8 +11,8 @@ 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 \ -ADD .env run-jikan.sh ./ +ADD .env /run-jikan.sh ./ ENTRYPOINT ["./run-jikan.sh"] \ No newline at end of file