From b6e0c6eb316edc7953f254beceef849d9d2471a6 Mon Sep 17 00:00:00 2001 From: JuLi0n21 Date: Sun, 22 Sep 2024 14:13:38 +0200 Subject: [PATCH] change script to call docker compose --- deploy.sh | 15 +++++++++++++++ docker-compose.yml | 25 +++++++++++++++++++++++++ start.sh | 46 ---------------------------------------------- 3 files changed, 40 insertions(+), 46 deletions(-) create mode 100644 deploy.sh create mode 100644 docker-compose.yml delete mode 100644 start.sh diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..43ab324 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +REPO_URL="https://github.com/juli0n21/pwa-player.git" +REPO_DIR=$(pwd) + +if [ -d "$REPO_DIR/.git" ]; then + echo "Pulling latest changes from $REPO_URL..." + git -C "$REPO_DIR" pull +else + echo "Cloning repository $REPO_URL..." + git clone "$REPO_URL" "$REPO_DIR" +fi + +docker compose up --build -d + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3c91d88 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,25 @@ +version: '3.8' + +services: + backend: + image: proxy + build: + context: ./proxy + container_name: proxy-container + ports: + - "5002:80" + volumes: + - ./data:/app/data + restart: always + depends_on: + - frontend + + frontend: + image: frontend + build: + context: ./frontend + container_name: frontend-container + ports: + - "5001:80" + restart: always + diff --git a/start.sh b/start.sh deleted file mode 100644 index 897562d..0000000 --- a/start.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -REPO_URL="https://github.com/juli0n21/pwa-player.git" -REPO_DIR=$(pwd) -BACKEND_IMAGE="proxy" -FRONTEND_IMAGE="frontend" -BACKEND_CONTAINER="proxy-container" -FRONTEND_CONTAINER="frontend-container" -BACKEND_PORT="5002" -FRONTEND_PORT="5001" - -if [ -d "$REPO_DIR/.git" ]; then - echo "Pulling latest changes from $REPO_URL..." - git -C "$REPO_DIR" pull -else - echo "Cloning repository $REPO_URL..." - git clone "$REPO_URL" "$REPO_DIR" -fi - -echo "Building backend Docker image..." -docker build -t "$BACKEND_IMAGE" "$REPO_DIR/proxy" # Assuming proxy is the backend directory - -echo "Building frontend Docker image..." -docker build -t "$FRONTEND_IMAGE" "$REPO_DIR/frontend" # Assuming frontend is the frontend directory - -if [ "$(docker ps -aq -f name=$BACKEND_CONTAINER)" ]; then - echo "Stopping old backend container..." - docker stop "$BACKEND_CONTAINER" - echo "Removing old backend container..." - docker rm "$BACKEND_CONTAINER" -fi - -if [ "$(docker ps -aq -f name=$FRONTEND_CONTAINER)" ]; then - echo "Stopping old frontend container..." - docker stop "$FRONTEND_CONTAINER" - echo "Removing old frontend container..." - docker rm "$FRONTEND_CONTAINER" -fi - -echo "Running new backend container..." -docker run -d -p "$BACKEND_PORT":80 --name "$BACKEND_CONTAINER" -v "$REPO_DIR/data:/app/data" "$BACKEND_IMAGE" - -echo "Running new frontend container..." -docker run -d -p "$FRONTEND_PORT":80 --name "$FRONTEND_CONTAINER" "$FRONTEND_IMAGE" - -docker ps