From 6cf9c8c4b2bcd7873c33e2b78f65ba50d704fde6 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Sat, 3 Oct 2026 19:12:58 +0200 Subject: [PATCH] remove unnecessary code --- .env.example | 6 ------ docker-compose.yml | 8 +------- docker/php/Dockerfile | 4 ++-- docker/php/entrypoint.sh | 3 +-- docker/php/scripts/setup_git.sh | 36 --------------------------------- 5 files changed, 4 insertions(+), 53 deletions(-) delete mode 100755 docker/php/scripts/setup_git.sh diff --git a/.env.example b/.env.example index 483177f..243a160 100755 --- a/.env.example +++ b/.env.example @@ -1,9 +1,3 @@ -BACKEND_GIT_REPO= -FRONTEND_GIT_REPO= -BACKEND_GIT_BRANCH= -FRONTEND_GIT_BRANCH= -GIT_TOKEN= - DB_CONNECTION= DB_HOST= DB_PORT= diff --git a/docker-compose.yml b/docker-compose.yml index d81838c..4f06c5c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,9 +26,6 @@ services: - ./docker/php/.env:/tmp/app.env:ro - typesense-data:/typesense-data:ro environment: - - GIT_TOKEN=${GIT_TOKEN} - - BACKEND_GIT_REPO=${BACKEND_GIT_REPO} - - BACKEND_GIT_BRANCH=${BACKEND_GIT_BRANCH} - DEV=${DEV} - DB_CONNECTION=${DB_CONNECTION} - DB_HOST=${DB_HOST} @@ -54,9 +51,6 @@ services: dockerfile: Dockerfile container_name: app-frontend environment: - - GIT_TOKEN=${GIT_TOKEN} - - FRONTEND_GIT_REPO=${FRONTEND_GIT_REPO} - - FRONTEND_GIT_BRANCH=${FRONTEND_GIT_BRANCH} - VITE_API_URL=${VITE_API_URL} - VITE_BROADCASTER=${VITE_BROADCASTER} - VITE_REVERB_KEY=${VITE_REVERB_KEY} @@ -134,4 +128,4 @@ networks: default: ipam: config: - - subnet: 192.168.200.0/24 \ No newline at end of file + - subnet: 192.168.200.0/24 diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 7aec8b4..3899f57 100755 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -21,7 +21,7 @@ COPY scripts/*.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/*.sh -WORKDIR /var/www/app +WORKDIR /var/www/app/apps/backend ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] -CMD ["php-fpm"] \ No newline at end of file +CMD ["php-fpm"] diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh index ae4bf21..cd993f0 100755 --- a/docker/php/entrypoint.sh +++ b/docker/php/entrypoint.sh @@ -9,7 +9,6 @@ set -e echo "[INIT] Starting initialization..." -setup_git setup_composer setup_env @@ -20,4 +19,4 @@ setup_laravel echo "[INIT] Done ✅" -exec "$@" \ No newline at end of file +exec "$@" diff --git a/docker/php/scripts/setup_git.sh b/docker/php/scripts/setup_git.sh deleted file mode 100755 index 4a2c9a1..0000000 --- a/docker/php/scripts/setup_git.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -setup_git() { - echo "Setting up Git..." - - GIT_URL="https://oauth2:${GIT_TOKEN}@${BACKEND_GIT_REPO}" - BRANCH="${BACKEND_GIT_BRANCH:-main}" - FORCE_CLONE="${FORCE_CLONE:-false}" - - git config --global --add safe.directory "$APP_DIR" - - if [ ! -d "$APP_DIR/.git" ]; then - echo "Cloning repo..." - git clone -b "$BRANCH" "$GIT_URL" "$APP_DIR" - else - echo "Updating repo..." - cd "$APP_DIR" - CURRENT_BRANCH=$(run git rev-parse --abbrev-ref HEAD) - - if [ "$CURRENT_BRANCH" = "$BRANCH" ]; then - run git fetch origin - run git reset --hard origin/"$CURRENT_BRANCH" - else - if [ "$FORCE_CLONE" = "true" ]; then - rm -rf "$APP_DIR" - mkdir -p "$APP_DIR" - git clone -b "$BRANCH" "$GIT_URL" "$APP_DIR" - else - run git fetch origin - run git reset --hard origin/"$BRANCH" - fi - fi - fi - - cd "$APP_DIR" -}