From 24861b368ffc9b8ad9db718eca91f047f134e902 Mon Sep 17 00:00:00 2001
From: Ernesto Celis <ernesto@celisdelafuente.net>
Date: Sun, 9 Jul 2023 17:38:20 -0600
Subject: [PATCH] feat(php): 8.0.29

---
 .dockerignore      |  3 ++-
 Dockerfile         | 19 ++++++++++++++++---
 docker-compose.yml |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 87f50f5..9203eda 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,9 @@
 docs
 modules
 utilities
-
+node_modules
 .~lock
 .~lock*
 .env
 data
+.git
diff --git a/Dockerfile b/Dockerfile
index 8322487..22edfb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4.28-apache
+FROM php:8.0.29-apache
 # Required dependencies
 RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
@@ -19,13 +19,26 @@ RUN apt-get update && apt-get install -y \
     && docker-php-ext-install mysqli \
     && docker-php-ext-install curl \
     && docker-php-ext-install mbstring \
-    && docker-php-ext-install zip 
+    && docker-php-ext-install zip
 RUN /usr/bin/yes '' | /usr/local/bin/pecl install mcrypt-1.0.6
 RUN /usr/bin/yes '' | /usr/local/bin/pecl install imagick
-RUN apt-get clean all \
+RUN apt-get remove \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+        default-libmysqlclient-dev \
+        libcurl4-openssl-dev \
+        libmcrypt-dev \
+        libzip-dev \
+        libmagick++-dev \
+        zlib1g-dev \
+        libpng-dev \
+        libonig-dev \
+  apt-get clean all \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
   rm -rf /var/lib/apt/lists/* ; \
   pecl update-channels ; \
+  rm -rf /usr/local/src ; \
   rm -rf /tmp/pear ~/.pearrc
 # ianseo setup
 COPY src/ /opt/ianseo
diff --git a/docker-compose.yml b/docker-compose.yml
index 1194ad7..3f1c37b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - MARIADB_DATABASE=ianseo
       - MARIADB_PASSWORD=ianseo
   ianseo:
-    image: ghcr.io/ecelis/ianseo-docker:v2023.04.01.562
+    image: ecelis/ianseo-docker:m-1
     ports:
       - "8080:80"
     depends_on: