TDvorak/Primora
1
0 Fork 0
mirror of https://github.com/Dvorinka/Primora.git synced 2026-10-28 07:41:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from Dvorinka/fix/installer-strip-build-blocks
CI / Backend Tests (push) Canceled after 0s
Details
CI / Frontend Tests (push) Canceled after 0s
Details
CI / Build All Services (push) Canceled after 0s
Details
CI / Docker Build (auth) (push) Canceled after 0s
Details
CI / Docker Build (backend) (push) Canceled after 0s
Details
CI / Docker Build (frontend) (push) Canceled after 0s
Details
CI / Migration Up/Down (push) Canceled after 0s
Details
CI / Compose E2E Smoke (push) Canceled after 0s
Details
CI / Lint (push) Canceled after 0s
Details
CI / Publish edge images (auth) (push) Canceled after 0s
Details
CI / Publish edge images (backend) (push) Canceled after 0s
Details
CI / Publish edge images (frontend) (push) Canceled after 0s
Details

Browse Source 
fix: strip build blocks in installer prebuilt path
This commit is contained in:
Tomáš Dvořák authored and GitHub committed 2026-09-21 22:31:36 +02:00
2 parents 11aa82b459 10c667dffd
commit 23868ef7c9
1 file changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+7 -4
View File
@@ -20,6 +20,10 @@ NGINX_PORT="${NGINX_PORT:-80}"
info() { echo "==> $*"; } info() { echo "==> $*"; }
die() { echo "ERROR: $*" >&2; exit 1; } die() { echo "ERROR: $*" >&2; exit 1; }
# '|' delimiter for sed: base64 output can contain '/', '+', '='.
SED=(sed -i)
[[ "$OSTYPE" == darwin* ]] && SED=(sed -i '')
command -v docker >/dev/null 2>&1 || die "docker is not installed" command -v docker >/dev/null 2>&1 || die "docker is not installed"
docker compose version >/dev/null 2>&1 || die "docker compose plugin is not installed" docker compose version >/dev/null 2>&1 || die "docker compose plugin is not installed"
command -v curl >/dev/null 2>&1 || die "curl is not installed" command -v curl >/dev/null 2>&1 || die "curl is not installed"
@@ -42,10 +46,6 @@ if [ ! -f .env ]; then
ENCRYPTION_KEY=$(openssl rand -hex 32) ENCRYPTION_KEY=$(openssl rand -hex 32)
DB_PASSWORD=$(openssl rand -hex 16) DB_PASSWORD=$(openssl rand -hex 16)
# '|' delimiter: base64 output can contain '/', '+', '='.
SED=(sed -i)
[[ "$OSTYPE" == darwin* ]] && SED=(sed -i '')
"${SED[@]}" "s|^POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASSWORD|" .env "${SED[@]}" "s|^POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASSWORD|" .env
"${SED[@]}" "s|postgres://primora:primora@|postgres://primora:$DB_PASSWORD@|" .env "${SED[@]}" "s|postgres://primora:primora@|postgres://primora:$DB_PASSWORD@|" .env
"${SED[@]}" "s|^JWT_SECRET=.*|JWT_SECRET=$JWT_SECRET|" .env "${SED[@]}" "s|^JWT_SECRET=.*|JWT_SECRET=$JWT_SECRET|" .env
@@ -68,6 +68,9 @@ if docker pull "ghcr.io/$GHCR_OWNER/primora-backend:latest" \
&& docker pull "ghcr.io/$GHCR_OWNER/primora-auth:latest" \ && docker pull "ghcr.io/$GHCR_OWNER/primora-auth:latest" \
&& docker pull "ghcr.io/$GHCR_OWNER/primora-frontend:latest"; then && docker pull "ghcr.io/$GHCR_OWNER/primora-frontend:latest"; then
info "Starting prebuilt images" info "Starting prebuilt images"
# The source tree isn't downloaded on this path — strip build: blocks so a
# later `compose build`/`up --build` can't fail on missing apps/*/Dockerfile.
"${SED[@]}" '/^[[:space:]]*build:/,/^[[:space:]]*dockerfile:/d' docker-compose.yml
docker compose up -d --no-build docker compose up -d --no-build
else else
# GHCR packages are private until first published release — build from source. # GHCR packages are private until first published release — build from source.