From a0e7ada889baa6a391f285b494b2996ebc0c3f98 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Fri, 9 Feb 2024 13:21:39 +0300 Subject: [PATCH 1/4] refactor(makefile): replace phpunit with parates --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0298109..a47ca4a 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ node-frontend-deps: docker-compose exec php-fpm npm i --legacy-peer-deps test: - docker-compose exec php-fpm vendor/bin/phpunit + docker-compose exec php-fpm vendor/bin/paratest fix-insights: docker-compose exec php-fpm ./artisan insights --fix From 944484713c87047afa0b64c5fbb393b3829b7b28 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Fri, 29 Mar 2024 13:45:03 +0300 Subject: [PATCH 2/4] feat(ffmpeg): add ffmpeg to php-fpm docker container --- phpdocker/php-fpm/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index dff8736..9a2084b 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -14,4 +14,9 @@ RUN apt-get update && \ apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* +RUN apt-get update && \ + apt-get install -y ffmpeg && \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* + ENV PATH=node_modules/.bin:$PATH From eb4072916cc64edb51cf0cf0db94e81b3905ae11 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Wed, 10 Apr 2024 00:34:00 +0300 Subject: [PATCH 3/4] feat(crontab): install cron in php-fpm container --- Makefile | 3 +++ phpdocker/php-fpm/Dockerfile | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index ae492c3..71d10cd 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,9 @@ worker-restart: clear-images: docker-compose exec php-fpm ./artisan clear:orphaned-images +links-images: + jdupes -r -1 -l app/storage/app + tinker: docker-compose exec php-fpm ./artisan tinker diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index 9a2084b..71892e2 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -1,6 +1,10 @@ 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,9 +18,17 @@ 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 clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* ENV PATH=node_modules/.bin:$PATH + +CMD ["supercronic", "/application/crontab"] From 89c55403a18f425a77a8d4efb7bcb5a46f4c8821 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Wed, 15 May 2024 14:49:39 +0300 Subject: [PATCH 4/4] feat(typesense): added service typesense for fuzzy search --- .gitignore | 1 + docker-compose.yml | 9 +++++++++ phpdocker/php-fpm/Dockerfile | 20 +++++++++++--------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6a783ee..b020775 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .env app/ mysql_data/ +typesense-data/ diff --git a/docker-compose.yml b/docker-compose.yml index 0a052a0..e312660 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -124,6 +124,15 @@ services: ns-eatvio: ipv4_address: 172.118.0.4 + typesense: + image: typesense/typesense:26.0 + restart: on-failure + ports: + - "8108:8108" + volumes: + - ./typesense-data:/data + command: "--data-dir /data --api-key=xyz --enable-cors" + networks: web: external: true diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index 71892e2..b8041fa 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -1,9 +1,9 @@ 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 +# 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 && \ @@ -12,17 +12,19 @@ RUN apt-get update && \ php8.2-gd \ php8.2-mysql \ php8.2-sqlite3 \ + php8.2-intl \ php8.2-pgsql \ python3-pkg-resources supervisor \ nodejs && npm install -g npm@10.1.0 \ 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 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 && \ @@ -31,4 +33,4 @@ RUN apt-get update && \ ENV PATH=node_modules/.bin:$PATH -CMD ["supercronic", "/application/crontab"] +# CMD ["supercronic", "/application/crontab"]