From 58f16c1dd635cc36a57ab0a15c949b2dd62df5d3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-KSVGT20\\shkim" Date: Fri, 5 Jun 2026 12:52:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=A7=84=20=EB=AA=A8=EC=A7=91=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 1 + deploy.sh | 5 ++--- run.sh | 13 +------------ 3 files changed, 4 insertions(+), 15 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfdb8b7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/deploy.sh b/deploy.sh index 5f0248f..f9b4256 100644 --- a/deploy.sh +++ b/deploy.sh @@ -24,7 +24,6 @@ echo "$(date '+%Y-%m-%d %H:%M:%S') deploy start" >> "$LOG_FILE" git -c credential.helper="store --file=/var/services/homes/whitekomani/.git-credentials" fetch origin main >> "$LOG_FILE" 2>&1 git reset --hard origin/main >> "$LOG_FILE" 2>&1 -/usr/local/bin/docker build -t photoreq:latest . >> "$LOG_FILE" 2>&1 -./run.sh >> "$LOG_FILE" 2>&1 +/usr/local/bin/docker rm -f photoreq >> "$LOG_FILE" 2>&1 || true -echo "$(date '+%Y-%m-%d %H:%M:%S') deploy done $(git rev-parse --short HEAD)" >> "$LOG_FILE" +echo "$(date '+%Y-%m-%d %H:%M:%S') deploy stopped photoreq $(git rev-parse --short HEAD)" >> "$LOG_FILE" diff --git a/run.sh b/run.sh index a8abd87..8b1acf0 100644 --- a/run.sh +++ b/run.sh @@ -2,17 +2,6 @@ set -eu APP_DIR="$(cd "$(dirname "$0")" && pwd)" -UPLOAD_DIR="/volume2/AKA Drive/사진 받기" /usr/local/bin/docker rm -f photoreq >/dev/null 2>&1 || true -/usr/local/bin/docker run -d \ - --name photoreq \ - --restart unless-stopped \ - -p 18082:8080 \ - --env-file "$APP_DIR/.env" \ - -e PUBLIC_BASE_URL="https://photoreq.mokaya.org" \ - -e ADMIN_ALLOWED_IPS="${ADMIN_ALLOWED_IPS:-112.159.64.27,162.12.184.41,192.168.219.100,192.168.219.1}" \ - -e MAX_FIELDS_SIZE_MB="2" \ - -v "$APP_DIR/data:/data" \ - -v "$UPLOAD_DIR:/uploads" \ - photoreq:latest +echo "photoreq is closed; container removed from $APP_DIR"