From b516eef4038676117506dfd25b5200d40b1ede4e Mon Sep 17 00:00:00 2001 From: Twyco Date: Mon, 24 Aug 2026 23:06:03 +0200 Subject: [PATCH] fix websocket env values --- .github/workflows/ci_cd.yml | 14 ++++++++++++++ Dockerfile | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 11fd7d4..56f621d 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -49,6 +49,8 @@ jobs: printf -v run_attempt '%03d' "${GITHUB_RUN_ATTEMPT}" tag="main-${GITHUB_RUN_NUMBER}-${run_attempt}-${GITHUB_SHA:0:12}" environment="staging" + vite_reverb_app_key="1af96b48d2ef78983e4ef281eed3a48b" + vite_reverb_host="scrum-poker.twyco-staging.de" ;; refs/tags/*) tag="${GITHUB_REF#refs/tags/}" @@ -66,6 +68,8 @@ jobs: fi environment="production" + vite_reverb_app_key="cfd9d925ff339374c04997beb90fbc32" + vite_reverb_host="scrum-poker.petsch-studios.de" ;; *) echo "Unsupported ref: ${GITHUB_REF}" >&2 @@ -77,6 +81,8 @@ jobs: echo "image=${image}" echo "tag=${tag}" echo "environment=${environment}" + echo "vite_reverb_app_key=${vite_reverb_app_key}" + echo "vite_reverb_host=${vite_reverb_host}" } >> "${GITHUB_OUTPUT}" - name: Log in to private registry @@ -104,6 +110,10 @@ jobs: IMAGE: ${{ steps.image.outputs.image }} IMAGE_TAG: ${{ steps.image.outputs.tag }} DEPLOYMENT_ENVIRONMENT: ${{ steps.image.outputs.environment }} + VITE_REVERB_APP_KEY: ${{ steps.image.outputs.vite_reverb_app_key }} + VITE_REVERB_HOST: ${{ steps.image.outputs.vite_reverb_host }} + VITE_REVERB_PORT: "443" + VITE_REVERB_SCHEME: https run: | set -Eeuo pipefail @@ -116,6 +126,10 @@ jobs: docker buildx build \ --file Dockerfile \ --target runtime \ + --build-arg "VITE_REVERB_APP_KEY=${VITE_REVERB_APP_KEY}" \ + --build-arg "VITE_REVERB_HOST=${VITE_REVERB_HOST}" \ + --build-arg "VITE_REVERB_PORT=${VITE_REVERB_PORT}" \ + --build-arg "VITE_REVERB_SCHEME=${VITE_REVERB_SCHEME}" \ --label "org.opencontainers.image.created=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ --label "org.opencontainers.image.revision=${GITHUB_SHA}" \ --label "org.opencontainers.image.source=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \ diff --git a/Dockerfile b/Dockerfile index 716cd68..3069ebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,16 @@ WORKDIR /var/www FROM php_base AS build +ARG VITE_REVERB_APP_KEY +ARG VITE_REVERB_HOST +ARG VITE_REVERB_PORT +ARG VITE_REVERB_SCHEME + +ENV VITE_REVERB_APP_KEY=${VITE_REVERB_APP_KEY} \ + VITE_REVERB_HOST=${VITE_REVERB_HOST} \ + VITE_REVERB_PORT=${VITE_REVERB_PORT} \ + VITE_REVERB_SCHEME=${VITE_REVERB_SCHEME} + COPY --from=node_binary /usr/local/ /usr/local/ COPY . /var/www