From 46e065ca29b5010301018308ee4923947e2253b3 Mon Sep 17 00:00:00 2001
From: alex-chevski <frostell.matters@gmail.com>
Date: Mon, 14 Oct 2024 11:13:49 +0300
Subject: [PATCH] feat(jpegoptim): added new apt package jpegoptim

---
 docker-compose.yml           | 31 +++++++++++++++----------------
 phpdocker/php-fpm/Dockerfile | 12 +++---------
 phpdocker/worker/Dockerfile  |  7 +++++++
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7c4ce54..f43dfdb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,8 +15,7 @@ services:
       - "${SOKETI_PORT:-6001}:6001"
       - "${SOKETI_METRICS_SERVER_PORT:-9601}:9601"
     networks:
-      ns-eatvio:
-        ipv4_address: 172.118.0.5
+      - ns-eatvio
     labels:
       - "traefik.enable=false"
     restart: always
@@ -25,8 +24,7 @@ services:
     image: "mysql:8.0"
     working_dir: /application
     networks:
-      ns-eatvio:
-        ipv4_address: 172.118.0.3
+      - ns-eatvio
     volumes:
       - ".:/application"
       - "./mysql_data:/var/lib/mysql"
@@ -49,8 +47,7 @@ services:
     depends_on:
       - mysql
     networks:
-      ns-eatvio:
-        ipv4_address: 172.118.0.2
+      - ns-eatvio
     volumes:
       - "./app:/application"
       - "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini"
@@ -104,32 +101,34 @@ services:
     volumes:
       - "./app:/application"
       - "./phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf"
+      - "./phpdocker/nginx/alex.eatvio.local+4.pem:/etc/nginx/alex.eatvio.local+4.pem"
+      - "./phpdocker/nginx/alex.eatvio.local+4-key.pem:/etc/nginx/alex.eatvio.local+4-key.pem"
+      - "./phpdocker/nginx/socket.alex.eatvio.local+4.pem:/etc/nginx/socket.alex.eatvio.local+4.pem"
+      - "./phpdocker/nginx/socket.alex.eatvio.local+4-key.pem:/etc/nginx/socket.alex.eatvio.local+4-key.pem"
     ports:
       - "1092:80"
+      - "10443:5000"
     networks:
       - web
       - ns-eatvio
-    labels:
-      - "traefik.docker.network=web"
-      - "traefik.enable=true"
-      - "traefik.frontend.rule=Host:dev2.eatvio.com,socket.eatvio.com"
-      - "traefik.port=80"
-      - "traefik.protocol=http"
 
   mailhog:
     image: "mailhog/mailhog"
     ports:
       - "8082:8025"
     networks:
-      ns-eatvio:
-        ipv4_address: 172.118.0.4
+      - ns-eatvio
 
   typesense:
     image: typesense/typesense:26.0
     restart: on-failure
+    expose:
+      - 8108
+    ports:
+      - 8108:8108
     networks:
-      ns-eatvio:
-        ipv4_address: 172.118.0.6
+      - ns-eatvio
+      - web
     volumes:
       - ./typesense-data:/data
     command: "--data-dir /data --api-key=typesense --enable-cors"
diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile
index b8041fa..7739cf8 100644
--- a/phpdocker/php-fpm/Dockerfile
+++ b/phpdocker/php-fpm/Dockerfile
@@ -19,18 +19,12 @@ RUN apt-get update && \
   apt-get clean; \
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
-# RUN curl -fsSLO "$SUPERCRONIC_URL" \
-#   && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
-#   && chmod +x "$SUPERCRONIC" \
-#   && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
-#   && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
-
 
 RUN apt-get update && \
-  apt-get install -y ffmpeg && \
+  apt-get install -y \
+  ffmpeg \
+  jpegoptim && \
   apt-get clean; \
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 ENV PATH=node_modules/.bin:$PATH
-
-# CMD ["supercronic", "/application/crontab"]
diff --git a/phpdocker/worker/Dockerfile b/phpdocker/worker/Dockerfile
index 59fe028..c5e636a 100644
--- a/phpdocker/worker/Dockerfile
+++ b/phpdocker/worker/Dockerfile
@@ -7,3 +7,10 @@ RUN apt-get update && \
   python3-pkg-resources supervisor && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
+RUN apt-get update && \
+  apt-get install -y \
+  ffmpeg \
+  jpegoptim && \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*