From 46e065ca29b5010301018308ee4923947e2253b3 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 14 Oct 2024 11:13:49 +0300 Subject: [PATCH 1/3] 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/* From 8f446edc47749a5b95863620a45d39be1769de95 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 14 Oct 2024 11:33:56 +0300 Subject: [PATCH 2/3] refactor(docker-compose.yml): restore docker-compose.yml to main --- docker-compose.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f43dfdb..7c4ce54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,8 @@ services: - "${SOKETI_PORT:-6001}:6001" - "${SOKETI_METRICS_SERVER_PORT:-9601}:9601" networks: - - ns-eatvio + ns-eatvio: + ipv4_address: 172.118.0.5 labels: - "traefik.enable=false" restart: always @@ -24,7 +25,8 @@ services: image: "mysql:8.0" working_dir: /application networks: - - ns-eatvio + ns-eatvio: + ipv4_address: 172.118.0.3 volumes: - ".:/application" - "./mysql_data:/var/lib/mysql" @@ -47,7 +49,8 @@ services: depends_on: - mysql networks: - - ns-eatvio + ns-eatvio: + ipv4_address: 172.118.0.2 volumes: - "./app:/application" - "./phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini" @@ -101,34 +104,32 @@ 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 + ns-eatvio: + ipv4_address: 172.118.0.4 typesense: image: typesense/typesense:26.0 restart: on-failure - expose: - - 8108 - ports: - - 8108:8108 networks: - - ns-eatvio - - web + ns-eatvio: + ipv4_address: 172.118.0.6 volumes: - ./typesense-data:/data command: "--data-dir /data --api-key=typesense --enable-cors" From d33a6d16d842d1f7d5549a26e4f78d62e94fdc73 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Mon, 14 Oct 2024 12:44:24 +0300 Subject: [PATCH 3/3] refactor: compact dockerfile --- phpdocker/php-fpm/Dockerfile | 14 +------------- phpdocker/worker/Dockerfile | 9 +-------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index 7739cf8..97ae02e 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -1,10 +1,6 @@ FROM phpdockerio/php:8.2-fpm WORKDIR "/application" -# ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.29/supercronic-linux-amd64 \ -# SUPERCRONIC=supercronic-linux-amd64 \ -# SUPERCRONIC_SHA1SUM=cd48d45c4b10f3f0bfdd3a57d054cd05ac96812b - RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - RUN apt-get update && \ apt-get -y --no-install-recommends install \ @@ -14,17 +10,9 @@ RUN apt-get update && \ php8.2-sqlite3 \ php8.2-intl \ php8.2-pgsql \ - python3-pkg-resources supervisor \ + python3-pkg-resources supervisor ffmpeg jpegoptim \ nodejs && npm install -g npm@10.1.0 \ 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/* - ENV PATH=node_modules/.bin:$PATH diff --git a/phpdocker/worker/Dockerfile b/phpdocker/worker/Dockerfile index c5e636a..d1c30cf 100644 --- a/phpdocker/worker/Dockerfile +++ b/phpdocker/worker/Dockerfile @@ -3,14 +3,7 @@ WORKDIR "/application" RUN apt-get update && \ apt-get -y --no-install-recommends install git \ - php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql \ + php8.2-gd php8.2-mysql php8.2-sqlite3 php8.2-pgsql ffmpeg jpegoptim \ 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/*