Merge pull request 'добавить в dockerfile сервис typesense' (#16) from alex_chevski/eatvio-infra:eatvio-infra into main

Reviewed-on: eatvio/eatvio-infra#16
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
This commit is contained in:
apoloz
2024-05-15 18:50:59 +00:00
4 changed files with 32 additions and 0 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
.env
app/
mysql_data/
typesense-data/

View File

@@ -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

View File

@@ -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

View File

@@ -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 \
@@ -8,6 +12,7 @@ RUN apt-get update && \
php8.2-gd \
php8.2-mysql \
php8.2-sqlite3 \
php8.2-intl \
php8.2-pgsql \
php8.2-intl \
python3-pkg-resources supervisor \
@@ -15,4 +20,18 @@ 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"]