From c55fef057cdcec867af91b29968541983cd80ec0 Mon Sep 17 00:00:00 2001 From: Elias Schneider Date: Tue, 6 May 2025 21:18:45 +0200 Subject: [PATCH] fix: correctly set script permissions inside Docker container --- Dockerfile | 2 +- scripts/create-one-time-access-token.sh | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c9b66bb..8100def4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ COPY --from=frontend-builder /app/frontend/package.json ./frontend/package.json COPY --from=backend-builder /app/backend/pocket-id-backend ./backend/pocket-id-backend COPY ./scripts ./scripts -RUN chmod +x ./scripts/**/*.sh +RUN find ./scripts -name "*.sh" -exec chmod +x {} \; EXPOSE 80 ENV APP_ENV=production diff --git a/scripts/create-one-time-access-token.sh b/scripts/create-one-time-access-token.sh index c71bec55..c4a2a1a1 100644 --- a/scripts/create-one-time-access-token.sh +++ b/scripts/create-one-time-access-token.sh @@ -1,3 +1,5 @@ +#!/bin/sh + DB_PATH="./backend/data/pocket-id.db" DB_PROVIDER="${DB_PROVIDER:=sqlite}" @@ -32,8 +34,14 @@ check_and_install() { local cmd=$1 local pkg=$2 - if ! command -v "$cmd" &>/dev/null; then - if command -v apk &>/dev/null; then + if + ! command -v "$cmd" & + >/dev/null + then + if + command -v apk & + >/dev/null + then echo "$cmd not found. Installing..." apk add "$pkg" --no-cache else @@ -105,4 +113,4 @@ else echo "Error creating access token." exit 1 fi -echo "=================================================" \ No newline at end of file +echo "================================================="