From e4e6f05362387f3ba1c1c1f55b6d146a6a2061fb Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <pferreiromero@gmail.com>
Date: Wed, 16 Mar 2022 00:26:45 +0100
Subject: [PATCH] upstream from PussTheCat-org/docker-proxitok-quay

---
 Dockerfile         | 25 +++++++++++++++++--------
 README.md          |  1 -
 docker-compose.yml |  1 -
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 423f106..3d18497 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,24 @@
-FROM php:8.0-apache
+FROM php:8-apache
 WORKDIR /var/www/html
-
 COPY --from=composer /usr/bin/composer /usr/bin/composer
-RUN apt update -y && apt install -y libzip-dev \
+RUN apt update -y && apt upgrade -y \
+    && apt install -y --no-install-recommends libzip-dev \
     && pecl install redis zip \
     && docker-php-ext-enable redis zip \
-    && a2enmod rewrite headers
-
-RUN ["mkdir", "/cache"]
-RUN ["chown", "-R", "www-data:www-data", "/cache"]
+    && a2enmod rewrite headers \
+    && mkdir /cache \
+    && chown -R www-data:www-data /cache \
+    && rm -rf /var/www/html/*
 
+# Copy project to /var/www/html
 COPY . .
+
+# Run composer and clean
 RUN composer update \
-    && composer install --no-interaction --optimize-autoloader --no-dev
+    && composer install --no-interaction --optimize-autoloader --no-dev \
+    && apt autoclean -y \
+    && apt autoremove -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /usr/bin/composer
+
+EXPOSE 80
diff --git a/README.md b/README.md
index 4b47596..d332ac8 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ Apply to: Main window (address bar)
 Please check [this](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting) wiki article for info on how to self-host your own instance
 
 ## TODO / Known issues
-* Docker
 * Add a NoJS version / Make the whole program without required JS
 * Make video on /video fit screen and don't overflow
 * i18n
diff --git a/docker-compose.yml b/docker-compose.yml
index 58b23f4..e88196f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,6 @@ services:
     depends_on:
       - redis
       - chrome
-
   redis:
     container_name: proxitok-redis
     image: redis:6-alpine