From 38afe37733c463c46f30f5cd451a1aae9e13b945 Mon Sep 17 00:00:00 2001
From: zeke <sfpj5l17y@mozmail.com>
Date: Wed, 17 Jan 2024 11:06:22 -0800
Subject: [PATCH] Update dependencies for Docker image

---
 Dockerfile         | 25 ++++++++++++++++---------
 docker-compose.yml |  6 +++---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c568280f..4e76f72e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,29 @@
-FROM php:5.6-fpm
+FROM php:8.1.8-fpm
+
+COPY . /code
+
 RUN docker-php-ext-install pdo pdo_mysql
-RUN apt-get update -y && apt-get install -y libpng-dev libjpeg-dev
+RUN apt-get update -y && apt-get install -y libpng-dev libjpeg-dev libonig-dev
 RUN docker-php-ext-install mbstring
 RUN apt-get update -y && apt-get install -y libmcrypt-dev
-RUN docker-php-ext-install -j$(nproc) mcrypt
+# RUN docker-php-ext-install -j$(nproc) mcrypt
 RUN docker-php-ext-install iconv
 RUN apt-get update -y && apt-get install -y imagemagick
 RUN apt-get update -y && apt-get install -y graphicsmagick
 RUN apt-get update -y && apt-get install -y gifsicle
-RUN docker-php-ext-configure gd \
-        --with-png-dir=/usr \
-        --with-jpeg-dir=/usr
+# RUN docker-php-ext-configure gd
+#         --with-jpeg=/usr/include
+#         --with-png-dir=/usr \
 RUN docker-php-ext-install gd
 RUN apt-get update -y \
-  && apt-get install -y libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-  && pecl install memcached-2.2.0 \
+  && apt-get install -y libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev git \
+  && pecl install memcached \
   && echo extension=memcached.so >> /usr/local/etc/php/conf.d/memcached.ini \
   && apt-get remove -y build-essential libmemcached-dev libz-dev \
   && apt-get autoremove -y \
   && apt-get clean \
-  && rm -rf /tmp/pear
\ No newline at end of file
+  && rm -rf /tmp/pear \
+  && curl -sS https://getcomposer.org/installer -o composer-setup.php \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
+  && docker-php-ext-install bcmath \
+  && cd /code && composer install
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d61f915..0008c064 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
-  #nginx webserver + php 5.6
+  #nginx webserver + php 8.x
   web:
-      image: nginx:1.19.6-alpine
+      image: nginx:1.25.3-alpine
       ports:
         - "8080:80"
       depends_on:
@@ -23,7 +23,7 @@ services:
           ipv4_address: 172.20.0.4
   #MySQL Service
   db:
-    image: mysql:5.6.50
+    image: mysql:8.0.35
     container_name: db
     restart: unless-stopped
     tty: true