Merged upstream 'zunjae/master' and adapted to local changes (#7)

* Works again, sorry, been sleeping

* Enable redis cache

- Enabled redis cache
- Changed some cache timings
- Disabled GitHub Reporting

* Moved all .env modifications to another layer

Unsure if another layer is that bad
But this improve .env changes rebuild times

Co-authored-by: sunjay <9930542+zunjae@users.noreply.github.com>
Co-authored-by: Angel Garcia <a-garcia-alvarez@users.noreply.github.com>

jikan/Dockerfile

@@ -1,29 +1,29 @@
 FROM php:7.4-apache
 
-ENV COMPOSER_ALLOW_SUPERUSER 1
+ENV	COMPOSER_ALLOW_SUPERUSER 1
 
-RUN apt-get update && apt-get install -y \
+RUN	apt-get update && apt-get install -y \
-    curl \
+	openssl \
-    git \
+	git \
-    unzip \
+	unzip \
-  && apt-get clean && rm -rf /var/lib/apt/lists/* \
+	&& apt-get clean && rm -rf /var/lib/apt/lists/* \
-  && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+	&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
-  && composer --version \
+	&& composer --version
-  && a2enmod rewrite \
-  && service apache2 restart \
-  && 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
 
-ADD run-jikan.sh ./
+RUN	git clone https://github.com/jikan-me/jikan-rest.git -b v3 . \
+	&& git checkout v3 \
+	&& cp .env.dist .env \
+	&& composer require 'composer/package-versions-deprecated' \
+	&& composer install --prefer-dist --no-progress --classmap-authoritative  --no-interaction \
+	&& composer update jikan-me/jikan
+
+RUN	sed    -i "s/CACHE_DRIVER=.*/CACHE_DRIVER=redis/" .env \
+	&& sed -i "s/REDIS_HOST=.*/REDIS_HOST=jikan-redis/" .env \
+	&& sed -i "s/CACHE_404_EXPIRE=.*/CACHE_404_EXPIRE=3600/" .env \
+	&& sed -i "s/CACHE_SEARCH_EXPIRE=.*/CACHE_SEARCH_EXPIRE=1000/" .env \
+	&& sed -i "s/GITHUB_REPORTING=.*/GITHUB_REPORTING=false/" .env
+
+ADD	/run-jikan.sh ./
 
 ENTRYPOINT ["./run-jikan.sh"]
 

jikan/run-jikan.sh

@@ -1,7 +1,3 @@
 #!/usr/bin/env bash
-# allow write permission
 chmod -R a+w storage/
-
+php -S 0.0.0.0:8080 -t public
-# php:7.3.14-apache-buster ENTRYPOINT
-#docker-php-entrypoint apache2-foreground
-php artisan serve --host 0.0.0.0 --port=8080