v1.12.27 NAS 실행 yaml 및 명시적 이미지 빌드 분리

This commit is contained in:
2026-10-21 17:36:47 +09:00
parent 345de36bd1
commit 2d4431e698
17 changed files with 195 additions and 46 deletions

View File

@@ -28,11 +28,11 @@ pick_compose_env_file() {
compose() {
if [ -n "$COMPOSE_ENV_FILE" ]; then
docker compose -f "$ROOT_DIR/docker-compose.yml" --env-file "$COMPOSE_ENV_FILE" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" --env-file "$COMPOSE_ENV_FILE" "$@"
return 0
fi
docker compose -f "$ROOT_DIR/docker-compose.yml" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" "$@"
}
pick_compose_env_file

View File

@@ -28,11 +28,11 @@ pick_compose_env_file() {
compose() {
if [ -n "$COMPOSE_ENV_FILE" ]; then
docker compose -f "$ROOT_DIR/docker-compose.yml" --env-file "$COMPOSE_ENV_FILE" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" --env-file "$COMPOSE_ENV_FILE" "$@"
return 0
fi
docker compose -f "$ROOT_DIR/docker-compose.yml" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" "$@"
}
pick_compose_env_file

View File

@@ -28,11 +28,11 @@ pick_compose_env_file() {
compose() {
if [ -n "$COMPOSE_ENV_FILE" ]; then
docker compose -f "$ROOT_DIR/docker-compose.yml" --env-file "$COMPOSE_ENV_FILE" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" --env-file "$COMPOSE_ENV_FILE" "$@"
return 0
fi
docker compose -f "$ROOT_DIR/docker-compose.yml" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" "$@"
}
pick_compose_env_file

View File

@@ -0,0 +1,22 @@
#!/bin/sh
set -eu
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
APP_SERVICE=${APP_SERVICE:-sori-studio}
cd "$ROOT_DIR"
if [ -n "${ENV_FILE:-}" ]; then
COMPOSE_ENV_FILE=$ENV_FILE
elif [ -r .env.production ]; then
COMPOSE_ENV_FILE=.env.production
else
printf '%s\n' '운영 환경 파일이 없습니다. .env.production 또는 ENV_FILE을 지정하세요.' >&2
exit 1
fi
if [ ! -r "$COMPOSE_ENV_FILE" ]; then
printf '%s\n' '지정한 환경 파일을 읽을 수 없습니다.' >&2
exit 1
fi
exec docker compose -f "$ROOT_DIR/docker-compose.build.yml" --env-file "$COMPOSE_ENV_FILE" build "$APP_SERVICE"

View File

@@ -52,11 +52,11 @@ load_env_file() {
compose() {
if [ -n "$COMPOSE_ENV_FILE" ]; then
docker compose -f "$ROOT_DIR/docker-compose.yml" --env-file "$COMPOSE_ENV_FILE" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" --env-file "$COMPOSE_ENV_FILE" "$@"
return 0
fi
docker compose -f "$ROOT_DIR/docker-compose.yml" "$@"
docker compose -f "$ROOT_DIR/docker-compose.yaml" "$@"
}
# 실행 중인 DB 컨테이너에서 PostgreSQL 계정 정보 읽기