From 08ced1e938dd7fd134f66b52e0ce90d5abd304b1 Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Sat, 7 Feb 2026 20:59:02 +0100 Subject: [PATCH] generate TYPESENSE_API_KEY --- docker-compose.yml | 7 +- docker/frontend/Dockerfile | 5 +- docker/frontend/entrypoint.sh | 13 +- docker/frontend/scripts/wait-for-it.sh | 182 +++++++++++++++++++++++++ docker/php/.env.example | 2 +- docker/php/Dockerfile | 4 +- docker/php/scripts/init-dev.sh | 7 + docker/php/scripts/init-prod.sh | 6 + docker/php/scripts/wait-typesense.sh | 3 + docker/typesense/Dockerfile | 6 + docker/typesense/entrypoint.sh | 16 +++ 11 files changed, 236 insertions(+), 15 deletions(-) create mode 100644 docker/frontend/scripts/wait-for-it.sh create mode 100644 docker/php/scripts/wait-typesense.sh create mode 100644 docker/typesense/Dockerfile create mode 100644 docker/typesense/entrypoint.sh diff --git a/docker-compose.yml b/docker-compose.yml index e7725b3..36adc1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,7 @@ services: volumes: - ./app-code:/var/www/app${DEV:+:delegated} - ./docker/php/.env:/tmp/app.env:ro + - typesense-data:/typesense-data:ro environment: - GIT_TOKEN=${GIT_TOKEN} - BACKEND_GIT_REPO=${BACKEND_GIT_REPO} @@ -31,6 +32,7 @@ services: - DEV=${DEV} depends_on: - mariadb + - typesense restart: unless-stopped healthcheck: test: [ "CMD-SHELL", "test -d /var/www/app/vendor && pidof php-fpm || exit 1" ] @@ -72,11 +74,12 @@ services: restart: unless-stopped typesense: - image: typesense/typesense:29.0 + build: + context: ./docker/typesense + dockerfile: Dockerfile restart: unless-stopped volumes: - typesense-data:/data - command: '--data-dir /data --api-key=${TYPESENSE_API_KEY} --enable-cors' backup: build: diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 94f40ac..78807c3 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -5,7 +5,10 @@ WORKDIR /app RUN apk add --no-cache git bash COPY entrypoint.sh /usr/local/bin/entrypoint.sh -RUN chmod +x /usr/local/bin/entrypoint.sh +COPY scripts/wait-for-it.sh /usr/local/bin/wait-for-it.sh + +RUN chmod +x /usr/local/bin/entrypoint.sh \ + /usr/local/bin/wait-for-it.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] CMD ["build"] diff --git a/docker/frontend/entrypoint.sh b/docker/frontend/entrypoint.sh index c288378..1b275c7 100644 --- a/docker/frontend/entrypoint.sh +++ b/docker/frontend/entrypoint.sh @@ -5,17 +5,10 @@ FRONTEND_DIR=/app APP_DIR=/var/www/app PUBLIC_DIR="$APP_DIR/public" GIT_URL="https://oauth2:${GIT_TOKEN}@${FRONTEND_GIT_REPO}" +PHP_HOST="app-php" +PHP_PORT=9000 -MAX_WAIT=300 -WAITED=0 -while [ ! -f "$APP_DIR/composer.json" ] || [ ! -d "$APP_DIR/vendor" ] || [ ! -f "$APP_DIR/public/index.php" ]; do - if [ $WAITED -ge $MAX_WAIT ]; then - exit 1 - fi - sleep 3 - WAITED=$((WAITED + 3)) -done - +/usr/local/bin/wait-for-it.sh "$PHP_HOST:$PHP_PORT" -t 300 if [ ! -d "$FRONTEND_DIR/.git" ]; then git clone -b "${FRONTEND_GIT_BRANCH:-main}" "$GIT_URL" "$FRONTEND_DIR" diff --git a/docker/frontend/scripts/wait-for-it.sh b/docker/frontend/scripts/wait-for-it.sh new file mode 100644 index 0000000..d990e0d --- /dev/null +++ b/docker/frontend/scripts/wait-for-it.sh @@ -0,0 +1,182 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# Check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) + +WAITFORIT_BUSYTIMEFLAG="" +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + # Check if busybox timeout uses -t flag + # (recent Alpine versions don't support -t anymore) + if timeout &>/dev/stdout | grep -q -e '-t '; then + WAITFORIT_BUSYTIMEFLAG="-t" + fi +else + WAITFORIT_ISBUSY=0 +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi diff --git a/docker/php/.env.example b/docker/php/.env.example index 7980e80..d3b85cf 100644 --- a/docker/php/.env.example +++ b/docker/php/.env.example @@ -76,4 +76,4 @@ VITE_APP_NAME="${APP_NAME}" SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,localhost:8000,localhost:5173 TYPESENSE_CONNECTION=typesense -TYPESENSE_API_KEY=xyz +TYPESENSE_API_KEY= diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 6e2d400..ff0faad 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -20,11 +20,13 @@ COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY scripts/init-dev.sh /usr/local/bin/init-dev.sh COPY scripts/init-prod.sh /usr/local/bin/init-prod.sh COPY scripts/wait-mariadb.sh /usr/local/bin/wait-mariadb.sh +COPY scripts/wait-typesense.sh /usr/local/bin/wait-typesense.sh RUN chmod +x /usr/local/bin/entrypoint.sh \ /usr/local/bin/init-dev.sh \ /usr/local/bin/init-prod.sh \ - /usr/local/bin/wait-mariadb.sh + /usr/local/bin/wait-mariadb.sh \ + /usr/local/bin/wait-typesense.sh WORKDIR /var/www/app diff --git a/docker/php/scripts/init-dev.sh b/docker/php/scripts/init-dev.sh index 6a1fa17..0953a76 100644 --- a/docker/php/scripts/init-dev.sh +++ b/docker/php/scripts/init-dev.sh @@ -48,6 +48,13 @@ if [ -f composer.json ]; then fi cp /tmp/app.env .env + +/usr/local/bin/wait-typesense.sh + +TYPESENSE_API_KEY=$(cat /typesense-data/api-key) +sed -i "s/^TYPESENSE_API_KEY=.*/TYPESENSE_API_KEY=$TYPESENSE_API_KEY/" .env + + chown www-data:www-data .env chmod 664 .env diff --git a/docker/php/scripts/init-prod.sh b/docker/php/scripts/init-prod.sh index 5bf7ed2..852a7b2 100644 --- a/docker/php/scripts/init-prod.sh +++ b/docker/php/scripts/init-prod.sh @@ -44,6 +44,12 @@ if [ -f composer.json ]; then composer install --no-interaction --prefer-dist cp /tmp/app.env .env + +/usr/local/bin/wait-typesense.sh + +TYPESENSE_API_KEY=$(cat /typesense-data/api-key) +sed -i "s/^TYPESENSE_API_KEY=.*/TYPESENSE_API_KEY=$TYPESENSE_API_KEY/" .env + chown www-data:www-data .env chmod 640 .env diff --git a/docker/php/scripts/wait-typesense.sh b/docker/php/scripts/wait-typesense.sh new file mode 100644 index 0000000..6d4dd33 --- /dev/null +++ b/docker/php/scripts/wait-typesense.sh @@ -0,0 +1,3 @@ +while [ ! -f /typesense-data/api-key ]; do + sleep 1 +done \ No newline at end of file diff --git a/docker/typesense/Dockerfile b/docker/typesense/Dockerfile new file mode 100644 index 0000000..6d4c8a4 --- /dev/null +++ b/docker/typesense/Dockerfile @@ -0,0 +1,6 @@ +FROM typesense/typesense:29.0 + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/typesense/entrypoint.sh b/docker/typesense/entrypoint.sh new file mode 100644 index 0000000..1e4303a --- /dev/null +++ b/docker/typesense/entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +DATA_DIR="/data" +KEY_FILE="$DATA_DIR/api-key" + +if [ ! -f "$KEY_FILE" ]; then + tr -dc A-Za-z0-9 "$KEY_FILE" +fi + +API_KEY=$(cat "$KEY_FILE") + +exec /opt/typesense-server \ + --data-dir "$DATA_DIR" \ + --api-key "$API_KEY" \ + --enable-cors