remove unnecessary code
This commit is contained in:
1 parent
ed38086d09
commit
6cf9c8c4b2
5 files changed
+4
-53
No files matched your search
@@ -1,9 +1,3 @@
|
|||||||
BACKEND_GIT_REPO=
|
|
||||||
FRONTEND_GIT_REPO=
|
|
||||||
BACKEND_GIT_BRANCH=
|
|
||||||
FRONTEND_GIT_BRANCH=
|
|
||||||
GIT_TOKEN=
|
|
||||||
|
|
||||||
DB_CONNECTION=
|
DB_CONNECTION=
|
||||||
DB_HOST=
|
DB_HOST=
|
||||||
DB_PORT=
|
DB_PORT=
|
||||||
|
|||||||
+1
-7
@@ -26,9 +26,6 @@ services:
|
|||||||
- ./docker/php/.env:/tmp/app.env:ro
|
- ./docker/php/.env:/tmp/app.env:ro
|
||||||
- typesense-data:/typesense-data:ro
|
- typesense-data:/typesense-data:ro
|
||||||
environment:
|
environment:
|
||||||
- GIT_TOKEN=${GIT_TOKEN}
|
|
||||||
- BACKEND_GIT_REPO=${BACKEND_GIT_REPO}
|
|
||||||
- BACKEND_GIT_BRANCH=${BACKEND_GIT_BRANCH}
|
|
||||||
- DEV=${DEV}
|
- DEV=${DEV}
|
||||||
- DB_CONNECTION=${DB_CONNECTION}
|
- DB_CONNECTION=${DB_CONNECTION}
|
||||||
- DB_HOST=${DB_HOST}
|
- DB_HOST=${DB_HOST}
|
||||||
@@ -54,9 +51,6 @@ services:
|
|||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
container_name: app-frontend
|
container_name: app-frontend
|
||||||
environment:
|
environment:
|
||||||
- GIT_TOKEN=${GIT_TOKEN}
|
|
||||||
- FRONTEND_GIT_REPO=${FRONTEND_GIT_REPO}
|
|
||||||
- FRONTEND_GIT_BRANCH=${FRONTEND_GIT_BRANCH}
|
|
||||||
- VITE_API_URL=${VITE_API_URL}
|
- VITE_API_URL=${VITE_API_URL}
|
||||||
- VITE_BROADCASTER=${VITE_BROADCASTER}
|
- VITE_BROADCASTER=${VITE_BROADCASTER}
|
||||||
- VITE_REVERB_KEY=${VITE_REVERB_KEY}
|
- VITE_REVERB_KEY=${VITE_REVERB_KEY}
|
||||||
@@ -134,4 +128,4 @@ networks:
|
|||||||
default:
|
default:
|
||||||
ipam:
|
ipam:
|
||||||
config:
|
config:
|
||||||
- subnet: 192.168.200.0/24
|
- subnet: 192.168.200.0/24
|
||||||
@@ -21,7 +21,7 @@ COPY scripts/*.sh /usr/local/bin/
|
|||||||
|
|
||||||
RUN chmod +x /usr/local/bin/*.sh
|
RUN chmod +x /usr/local/bin/*.sh
|
||||||
|
|
||||||
WORKDIR /var/www/app
|
WORKDIR /var/www/app/apps/backend
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||||
CMD ["php-fpm"]
|
CMD ["php-fpm"]
|
||||||
@@ -9,7 +9,6 @@ set -e
|
|||||||
|
|
||||||
echo "[INIT] Starting initialization..."
|
echo "[INIT] Starting initialization..."
|
||||||
|
|
||||||
setup_git
|
|
||||||
setup_composer
|
setup_composer
|
||||||
setup_env
|
setup_env
|
||||||
|
|
||||||
@@ -20,4 +19,4 @@ setup_laravel
|
|||||||
|
|
||||||
echo "[INIT] Done ✅"
|
echo "[INIT] Done ✅"
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
@@ -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"
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user