From dc4dc63dddc12c0bb5fdce4a6b4ac794cdfb18b1 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 24 Sep 2025 09:48:41 +0000 Subject: [PATCH] Update --- Dockerfile | 23 ----------------------- docker-compose.dev.yml | 11 ----------- scripts/switch-branch.sh | 11 ++++++++++- 3 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 Dockerfile delete mode 100644 docker-compose.dev.yml diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 9ba01f2..0000000 --- a/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# Stage 1: Frontend build -FROM node:20-alpine AS frontend-build -WORKDIR /app/frontend -COPY frontend/package.json frontend/package-lock.json ./ -RUN npm ci -COPY frontend/ ./ -RUN npm run build - -# Stage 2: Backend + static frontend -FROM node:20-alpine AS runtime -WORKDIR /app/backend -COPY backend/package.json backend/package-lock.json ./ -RUN npm ci --only=production -COPY backend/ ./ -COPY --from=frontend-build /app/frontend/build ./public - -ENV NODE_ENV=production -EXPOSE 4000 # Port wird über .env gesetzt - -RUN chown -R node:node /app/backend -USER node - -CMD ["node", "index.js"] diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml deleted file mode 100644 index f7ca830..0000000 --- a/docker-compose.dev.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3.8' -services: - app: - build: - context: . - dockerfile: Dockerfile - ports: - - "${PORT}:${PORT}" - env_file: - - .env - restart: unless-stopped diff --git a/scripts/switch-branch.sh b/scripts/switch-branch.sh index 71e2fcf..c025b64 100755 --- a/scripts/switch-branch.sh +++ b/scripts/switch-branch.sh @@ -44,9 +44,18 @@ fi SELECTED_BRANCH=${BRANCH_MAP[$choice]} echo "Wechsle zu Branch: $SELECTED_BRANCH" -# Wechseln, ggf. Branch erstellen, wenn nur Remote existiert +# Remote-Stand holen +git fetch origin + +# Branch wechseln (lokal erstellen, falls nur remote vorhanden) if git show-ref --verify --quiet refs/heads/$SELECTED_BRANCH; then git checkout $SELECTED_BRANCH else git checkout -b $SELECTED_BRANCH origin/$SELECTED_BRANCH fi + +# Arbeitsverzeichnis exakt auf Remote-Branch zurücksetzen +git reset --hard origin/$SELECTED_BRANCH +git clean -fd + +echo "Branch '$SELECTED_BRANCH' ist nun aktiv. Arbeitsverzeichnis entspricht exakt dem Remote-Stand."