app에서 php,nodejs package를 사전 준비

- gogs -> gitea
- 문법 경고 수정

README.md

@@ -8,9 +8,9 @@ Docker-compose를 지원하는 모든 환경 (Windows 10 Pro 포함)
 
 Docker가 설치되지 않았다면 다음을 통해 설치합니다.
 
-* POSIX - https://docs.docker.com/install/ 을 통해 Docker를, https://docs.docker.com/compose/install/ 를 통해 Docker-compose를 설치합니다.
+* POSIX - <https://docs.docker.com/install/> 을 통해 Docker를, <https://docs.docker.com/compose/install/> 를 통해 Docker-compose를 설치합니다.
 
-* Windows 10 - https://docs.docker.com/docker-for-windows/install/ 를 통해 Docker Desktop on Windows 를 설치합니다. 회원 가입을 원하지 않는다면, https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe 를 통해 설치합니다.
+* Windows 10 - <https://docs.docker.com/docker-for-windows/install/> 를 통해 Docker Desktop on Windows 를 설치합니다. 회원 가입을 원하지 않는다면, <https://download.docker.com/win/stable/Docker%20for%20Windows%20Installer.exe> 를 통해 설치합니다.
 
 > ⚠️**주의**: Docker Desktop on Windows는 Virtual Box, VMWare와 잘 호환되지 않는 것으로 알려져 있습니다.
 만약 Virtual Box나 Virtual Box를 이용하는 안드로이드 가상 머신을 이용할 경우 Docker Toolbox를 설치하십시오.
@@ -21,41 +21,42 @@ Docker가 설치되지 않았다면 다음을 통해 설치합니다.
 
 docker, docker-compose를 사용 가능한 상황임을 가정합니다.
 
-https://storage.hided.net/gogs/devsam/docker/archive/master.zip 링크를 통해 zip 파일을 다운받아 압축을 풉니다. 
+<https://storage.hided.net/gitea/devsam/docker/archive/master.zip> 링크를 통해 zip 파일을 다운받아 압축을 풉니다.
 
-### 기본 설정 
+### 기본 설정
 
-기본적으로 수정이 필요한 항목은 다음과 같습니다. 
+기본적으로 수정이 필요한 항목은 다음과 같습니다.
 
- - `hidche/account.env` : 계정정보 설정, 공란으로 남겨진 공간을 적절하게 채웁니다.
+* `hidche/account.env` : 계정정보 설정, 공란으로 남겨진 공간을 적절하게 채웁니다.
-   - Password에 해당하는 항목들은 가급적 어렵게 지어주십시오.
+  * Password에 해당하는 항목들은 가급적 어렵게 지어주십시오.
-   - 특히 `HIDCHE_PW_SALT`는 자동 설치 시 1회만 사용되므로 최대한 길고 어렵게 지어주십시오.
+  * 특히 `HIDCHE_PW_SALT`는 자동 설치 시 1회만 사용되므로 최대한 길고 어렵게 지어주십시오.
-   - `HIDCHE_KAKAO_REST_KEY`, `HIDCHE_KAKAO_ADMIN_KEY`는 [KakaoTalk REST API](https://developers.kakao.com/docs/restapi/kakaotalk-api)를 통해 발급 받을 수 있습니다. 동의 항목으로는 카카오계정(이메일), 카카오톡 메시지 전송이 필요합니다.
+  * `HIDCHE_KAKAO_REST_KEY`, `HIDCHE_KAKAO_ADMIN_KEY`는 [KakaoTalk REST API](https://developers.kakao.com/docs/restapi/kakaotalk-api)를 통해 발급 받을 수 있습니다. 동의 항목으로는 카카오계정(이메일), 카카오톡 메시지 전송이 필요합니다.
-   - `HIDCHE_IMAGE_REQUEST_KEY`는 이미지 서비스용 git과 게임 git repository를 연동하기위한 키입니다. 특히 이미지 서비스가 다른 서버에서 실행될 때 유용합니다. 이 값이 지정되지 않은 경우 `image/hook/git_pull.php`을 PHP CLI를 통해 직접 실행해야만 합니다.
+  * `HIDCHE_IMAGE_REQUEST_KEY`는 이미지 서비스용 git과 게임 git repository를 연동하기위한 키입니다. 특히 이미지 서비스가 다른 서버에서 실행될 때 유용합니다. 이 값이 지정되지 않은 경우 `image/hook/git_pull.php`을 PHP CLI를 통해 직접 실행해야만 합니다.
- - `hidche/game.env` : 게임 설치 정보 설정 공간입니다. 값 하나를 변경해야 합니다.
+
-   - `HIDCHE_GAME_PATH` : 외부 유저가 접속할 수 있는 경로입니다. 공인 IP 주소나 도메인 주소를 사용한 주소로 꼭 변경해야합니다. 변경하지 않을 경우 설치는 되지만, 외부 유저가 이용할 수 없습니다. 명확한 이유가 있는게 아니라면 `/sam` 까지 붙여주십시오.
+* `hidche/game.env` : 게임 설치 정보 설정 공간입니다. 값 하나를 변경해야 합니다.
-    - 이 주소를 이용하여 카카오 API의 로그인 Redirect URI를 설정해야 합니다. 주소가 https://sam.hided.net/sam 인 경우 https://sam.hided.net/sam/oauth_kakao/oauth.php 으로 입력합니다.
+  * `HIDCHE_GAME_PATH` : 외부 유저가 접속할 수 있는 경로입니다. 공인 IP 주소나 도메인 주소를 사용한 주소로 꼭 변경해야합니다. 변경하지 않을 경우 설치는 되지만, 외부 유저가 이용할 수 없습니다. 명확한 이유가 있는게 아니라면 `/sam` 까지 붙여주십시오.
-    - 포트 주소는 8080으로 지정되어있으며, 다른 포트로 바꾸고자 한다면 `hidche/docker-compose.yml`와 동일하게 유지해야 합니다.
+  * 이 주소를 이용하여 카카오 API의 로그인 Redirect URI를 설정해야 합니다. 주소가 <https://sam.hided.net/sam> 인 경우 <https://sam.hided.net/sam/oauth_kakao/oauth.php> 으로 입력합니다.
+  * 포트 주소는 8080으로 지정되어있으며, 다른 포트로 바꾸고자 한다면 `hidche/docker-compose.yml`와 동일하게 유지해야 합니다.
 
 >Windows 환경에서 적절한 텍스트 에디터를 찾지 못하였다면 메모장에 해당 파일들을 드래그하여 수정하거나, [Notepad++](https://notepad-plus-plus.org/downloads/ )를 설치하여 수정하는 방법도 가능합니다.
 
-### 고급 설정 
+### 고급 설정
 
 고급 설정이 필요하다면 다음을 수정합니다.
 
- - `hidche/docker-compose.yml` : 설치 옵션입니다.
+* `hidche/docker-compose.yml` : 설치 옵션입니다.
-   - `web/ports`: 8080 포트 대신 다른 포트를 선택하고자 할 경우 수정합니다. `hidche/game.env`의 내용도 변경해야합니다.
+  * `web/ports`: 8080 포트 대신 다른 포트를 선택하고자 할 경우 수정합니다. `hidche/game.env`의 내용도 변경해야합니다.
-   - `build/args` : nginx/www-data의 UID와 GID를 변경할 수 있습니다. `web`, `app`, `board` 셋을 동시에 지정해야합니다.
+  * `build/args` : nginx/www-data의 UID와 GID를 변경할 수 있습니다. `web`, `app`, `board` 셋을 동시에 지정해야합니다.
- - `hidche/game.env`
+* `hidche/game.env`
-   - `gameGitPath`, `imgGitPath`: 개발을 위해 다른 git repository를 사용해야한다면 수정합니다. ssh 주소인 경우 `hidche/app/id_ecdsa`와 `hidche/app/known_hosts` 또한 수정해야 합니다.
+  * `gameGitPath`, `imgGitPath`: 개발을 위해 다른 git repository를 사용해야한다면 수정합니다. ssh 주소인 경우 `hidche/app/id_ecdsa`와 `hidche/app/known_hosts` 또한 수정해야 합니다.
-   - `HIDCHE_IMAGE_USE_INTERNAL`, `HIDCHE_IMAGE_PATH`는 CDN 등 외부 이미지 경로를 사용할 경우 수정합니다.
+  * `HIDCHE_IMAGE_USE_INTERNAL`, `HIDCHE_IMAGE_PATH`는 CDN 등 외부 이미지 경로를 사용할 경우 수정합니다.
- - 기타 적절한 용도에 맞게 수정하여 사용합니다.
+* 기타 적절한 용도에 맞게 수정하여 사용합니다.
 
 ### Docker-compose 실행
 
 파일 설정이 모두 끝났다면, 콘솔에서 hidche 폴더로 이동하여 다음을 실행합니다.
 
-```
+```bash
 docker-compose up -d
 ```
 
@@ -63,4 +64,4 @@ docker-compose up -d
 
 설치 후, 게임을 이용할 수 있습니다.
 
-게시판으로 Rhymix를 설치할 수 있도록 다운로드하며 설치 완료 된 주소에 `/board`를 붙여 게시판 설정을 마무리합니다.
+게시판으로 Rhymix를 설치할 수 있도록 다운로드하며 설치 완료 된 주소에 `/board`를 붙여 게시판 설정을 마무리합니다.

hidche/account.orig.env

@@ -1,14 +1,12 @@
 
-#MYSQL 비밀번호. (필수)
+#MARIADB 비밀번호. (필수)
-MYSQL_ROOT_PASSWORD=
+MARIADB_ROOT_PASSWORD=
-MYSQL_USER=hidche
-MYSQL_PASSWORD=
 HIDCHE_PW_SALT=
 HIDCHE_DB_PREFIX=hidche
 
-#MYSQL 게시판 비밀번호. (필수)
+#게시판 DB 비밀번호.
-MYSQL_BBS_USER=board
+HIDCHE_DB_BBS_USER=board
-MYSQL_BBS_PASSWORD=
+HIDCHE_DB_BBS_PASSWORD=
 
 #이미지 동기화 키. (16글자 이상, 빈칸인 경우 랜덤)
 HIDCHE_IMAGE_REQUEST_KEY=

hidche/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-fpm-bullseye
+FROM php:8.1-fpm-bullseye
 #debian
 
 ENV LC_ALL=C.UTF-8

hidche/app/entrypoint.sh

@@ -14,6 +14,13 @@ if [ ! -f "$samRoot/index.php" ]; then
     mkdir -p $samRoot
     chown -R www-data:www-data $wwwRoot
     gosu www-data git clone $gameGitPath $samRoot
+    gosu www-data git checkout $gameGitBranch
+
+    pushd $samRoot
+    gosu www-data npm ci
+    gosu www-data npm run build -- --env target=gateway
+    gosu www-data php composer.phar install
+    popd
 fi
 
 if [ "$HIDCHE_IMAGE_USE_INTERNAL" = "yes" ] && [ ! -d "$imageRoot" ]; then

hidche/app/sam_conf.ini

@@ -1,5 +1,5 @@
 expose_php = Off
-
+max_execution_time = 300
 pdo_mysql.cache_size = 2000
 mysqli.cache_size = 2000
 memory_limit=512M
@@ -15,3 +15,4 @@ opcache.memory_consumption=128
 opcache.save_comments=1
 opcache.revalidate_freq=1
 opcache.file_cache="/var/www/opcache"
+opcache.jit="function"

hidche/db/entrypoint.sh

@@ -1,25 +1,22 @@
 #!/bin/bash
-# from https://github.com/docker-library/mariadb/blob/master/10.4/Dockerfile
-
 set -eo pipefail
 shopt -s nullglob
 
-
+# logging functions
-# if command starts with an option, prepend mysqld
+mysql_log() {
-if [ "${1:0:1}" = '-' ]; then
+	local type="$1"; shift
-	set -- mysqld "$@"
+	printf '%s [%s] [Entrypoint]: %s\n' "$(date --rfc-3339=seconds)" "$type" "$*"
-fi
+}
-
+mysql_note() {
-# skip setup if they want an option that stops mysqld
+	mysql_log Note "$@"
-wantHelp=
+}
-for arg; do
+mysql_warn() {
-	case "$arg" in
+	mysql_log Warn "$@" >&2
-		-'?'|--help|--print-defaults|-V|--version)
+}
-			wantHelp=1
+mysql_error() {
-			break
+	mysql_log ERROR "$@" >&2
-			;;
+	exit 1
-	esac
+}
-done
 
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -30,8 +27,7 @@ file_env() {
 	local fileVar="${var}_FILE"
 	local def="${2:-}"
 	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+		mysql_error "Both $var and $fileVar are set (but are exclusive)"
-		exit 1
 	fi
 	local val="$def"
 	if [ "${!var:-}" ]; then
@@ -43,18 +39,25 @@ file_env() {
 	unset "$fileVar"
 }
 
-_check_config() {
+# set MARIADB_xyz from MYSQL_xyz when MARIADB_xyz is unset
-	toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" )
+# and make them the same value (so user scripts can use either)
-	if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
+_mariadb_file_env() {
-		cat >&2 <<-EOM
+	local var="$1"; shift
-			ERROR: mysqld failed while attempting to check config
+	local maria="MARIADB_${var#MYSQL_}"
-			command was: "${toRun[*]}"
+	file_env "$var" "$@"
-			$errors
+	file_env "$maria" "${!var}"
-		EOM
+	if [ "${!maria:-}" ]; then
-		exit 1
+		export "$var"="${!maria}"
 	fi
 }
 
+# check to see if this file is being run or sourced from another script
+_is_sourced() {
+	# https://unix.stackexchange.com/a/215279
+	[ "${#FUNCNAME[@]}" -ge 2 ] \
+		&& [ "${FUNCNAME[0]}" = '_is_sourced' ] \
+		&& [ "${FUNCNAME[1]}" = 'source' ]
+}
 
 #modifed
 file_env 'TZ'
@@ -63,161 +66,362 @@ ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 #modifed
 hidcheDBList=("root" "che" "kwe" "pwe" "twe" "nya" "pya" "hwe")
 
+# usage: docker_process_init_files [file [file [...]]]
+#    ie: docker_process_init_files /always-initdb.d/*
+# process initializer files, based on file extensions
+docker_process_init_files() {
+	# mysql here for backwards compatibility "${mysql[@]}"
+	mysql=( docker_process_sql )
+
+	echo
+	local f
+	for f; do
+		case "$f" in
+			*.sh)
+				# https://github.com/docker-library/postgres/issues/450#issuecomment-393167936
+				# https://github.com/docker-library/postgres/pull/452
+				if [ -x "$f" ]; then
+					mysql_note "$0: running $f"
+					"$f"
+				else
+					mysql_note "$0: sourcing $f"
+					. "$f"
+				fi
+				;;
+			*.sql)     mysql_note "$0: running $f"; docker_process_sql < "$f"; echo ;;
+			*.sql.gz)  mysql_note "$0: running $f"; gunzip -c "$f" | docker_process_sql; echo ;;
+			*.sql.xz)  mysql_note "$0: running $f"; xzcat "$f" | docker_process_sql; echo ;;
+			*.sql.zst) mysql_note "$0: running $f"; zstd -dc "$f" | docker_process_sql; echo ;;
+			*)         mysql_warn "$0: ignoring $f" ;;
+		esac
+		echo
+	done
+}
+
+# arguments necessary to run "mariadbd --verbose --help" successfully (used for testing configuration validity and for extracting default/configured values)
+_verboseHelpArgs=(
+	--verbose --help
+	--log-bin-index="$(mktemp -u)" # https://github.com/docker-library/mysql/issues/136
+)
+
+mysql_check_config() {
+	local toRun=( "$@" "${_verboseHelpArgs[@]}" ) errors
+	if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
+		mysql_error $'mariadbd failed while attempting to check config\n\tcommand was: '"${toRun[*]}"$'\n\t'"$errors"
+	fi
+}
+
 # Fetch value from server config
-# We use mysqld --verbose --help instead of my_print_defaults because the
+# We use mariadbd --verbose --help instead of my_print_defaults because the
 # latter only show values present in config files, and not server defaults
-_get_config() {
+mysql_get_config() {
 	local conf="$1"; shift
-	"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
+	"$@" "${_verboseHelpArgs[@]}" 2>/dev/null \
-		| awk '$1 == "'"$conf"'" && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
+		| awk -v conf="$conf" '$1 == conf && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
 	# match "datadir      /some/path with/spaces in/it here" but not "--xyz=abc\n     datadir (xyz)"
 }
 
-# allow the container to be started with `--user`
+# Do a temporary startup of the MariaDB server, for init purposes
-if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
+docker_temp_server_start() {
-	_check_config "$@"
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF &
-	DATADIR="$(_get_config 'datadir' "$@")"
+	mysql_note "Waiting for server startup"
-	mkdir -p "$DATADIR"
+	# only use the root password if the database has already been initializaed
-	find "$DATADIR" \! -user mysql -exec chown mysql '{}' +
+	# so that it won't try to fill in a password file when it hasn't been set yet
-	exec gosu mysql "$BASH_SOURCE" "$@"
+	extraArgs=()
-fi
+	if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
-
+		extraArgs+=( '--dont-use-mysql-root-password' )
-if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
-	# still need to check config, container may have started with --user
-	_check_config "$@"
-	# Get config
-	DATADIR="$(_get_config 'datadir' "$@")"
-
-	if [ ! -d "$DATADIR/mysql" ]; then
-		file_env 'MYSQL_ROOT_PASSWORD'
-		if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
-			echo >&2 'error: database is uninitialized and password option is not specified '
-			echo >&2 '  You need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD'
-			exit 1
-		fi
-
-		mkdir -p "$DATADIR"
-
-		echo 'Initializing database'
-		installArgs=( --datadir="$DATADIR" --rpm )
-		if { mysql_install_db --help || :; } | grep -q -- '--auth-root-authentication-method'; then
-			# beginning in 10.4.3, install_db uses "socket" which only allows system user root to connect, switch back to "normal" to allow mysql root without a password
-			# see https://github.com/MariaDB/server/commit/b9f3f06857ac6f9105dc65caae19782f09b47fb3
-			# (this flag doesn't exist in 10.0 and below)
-			installArgs+=( --auth-root-authentication-method=normal )
-		fi
-		# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
-		mysql_install_db "${installArgs[@]}" "${@:2}"
-		echo 'Database initialized'
-
-		SOCKET="$(_get_config 'socket' "$@")"
-		"$@" --skip-networking --socket="${SOCKET}" &
-		pid="$!"
-
-		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
-
-		for i in {30..0}; do
-			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
-				break
-			fi
-			echo 'MySQL init process in progress...'
-			sleep 1
-		done
-		if [ "$i" = 0 ]; then
-			echo >&2 'MySQL init process failed.'
-			exit 1
-		fi
-
-		if [ -z "$MYSQL_INITDB_SKIP_TZINFO" ]; then
-			# sed is for https://bugs.mysql.com/bug.php?id=20545
-			mysql_tzinfo_to_sql /usr/share/zoneinfo | sed 's/Local time zone must be set--see zic manual page/FCTY/' | "${mysql[@]}" mysql
-		fi
-
-		if [ ! -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
-			export MYSQL_ROOT_PASSWORD="$(pwgen -1 32)"
-			echo "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
-		fi
-
-		rootCreate=
-		# default root to listen for connections from anywhere
-		file_env 'MYSQL_ROOT_HOST' '%'
-		if [ ! -z "$MYSQL_ROOT_HOST" -a "$MYSQL_ROOT_HOST" != 'localhost' ]; then
-			# no, we don't care if read finds a terminating character in this heredoc
-			# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
-			read -r -d '' rootCreate <<-EOSQL || true
-				CREATE USER 'root'@'${MYSQL_ROOT_HOST}' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
-				GRANT ALL ON *.* TO 'root'@'${MYSQL_ROOT_HOST}' WITH GRANT OPTION ;
-			EOSQL
-		fi
-
-		"${mysql[@]}" <<-EOSQL
-			-- What's done in this file shouldn't be replicated
-			--  or products like mysql-fabric won't work
-			SET @@SESSION.SQL_LOG_BIN=0;
-			DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ;
-			SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ;
-			GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION ;
-			${rootCreate}
-			DROP DATABASE IF EXISTS test ;
-			FLUSH PRIVILEGES ;
-		EOSQL
-
-		if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
-			mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
-		fi
-
-		
-		#modifed
-		file_env 'HIDCHE_DB_PREFIX'
-		for dbName in "${hidcheDBList[@]}"; do
-			fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
-			echo "CREATE DATABASE IF NOT EXISTS \`$fullDBName\` ;" | "${mysql[@]}"
-		done
-
-		file_env 'MYSQL_USER'
-		file_env 'MYSQL_PASSWORD'
-		if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
-			echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" | "${mysql[@]}"
-			for dbName in "${hidcheDBList[@]}"; do
-				fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
-				subPW=`echo -n ${dbName}${HIDCHE_PW_SALT}${MYSQL_USER}${MYSQL_PASSWORD}${dbName}${HIDCHE_PW_SALT} | shasum -a 512`
-				subPW=${subPW:0:32}
-				echo "CREATE USER '$fullDBName'@'%' IDENTIFIED BY '$subPW' ;" | "${mysql[@]}"
-				echo "GRANT ALL ON \`$fullDBName\`.* TO '$MYSQL_USER'@'%' ;" | "${mysql[@]}"
-				echo "GRANT ALL ON \`$fullDBName\`.* TO '$fullDBName'@'%' ;" | "${mysql[@]}"
-			done
-		fi
-
-		file_env 'MYSQL_BBS_USER'
-		file_env 'MYSQL_BBS_PASSWORD'
-		if [ "$MYSQL_BBS_USER" -a "$MYSQL_BBS_PASSWORD" ]; then
-			echo "CREATE USER '$MYSQL_BBS_USER'@'%' IDENTIFIED BY '$MYSQL_BBS_PASSWORD' ;" | "${mysql[@]}"
-			fullDBName="${HIDCHE_DB_PREFIX}_board"
-			echo "CREATE DATABASE IF NOT EXISTS \`$fullDBName\` ;" | "${mysql[@]}"
-			echo "GRANT ALL ON \`$fullDBName\`.* TO '$MYSQL_USER'@'%' ;" | "${mysql[@]}"
-			echo "GRANT ALL ON \`$fullDBName\`.* TO '$MYSQL_BBS_USER'@'%' ;" | "${mysql[@]}"
-		fi
-
-		echo
-		for f in /docker-entrypoint-initdb.d/*; do
-			case "$f" in
-				*.sh)     echo "$0: running $f"; . "$f" ;;
-				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
-				*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${mysql[@]}"; echo ;;
-				*)        echo "$0: ignoring $f" ;;
-			esac
-			echo
-		done
-
-		if ! kill -s TERM "$pid" || ! wait "$pid"; then
-			echo >&2 'MySQL init process failed.'
-			exit 1
-		fi
-
-		echo
-		echo 'MySQL init process with HIDCHE done. Ready for start up.'
-		echo
 	fi
-fi
+	local i
+	for i in {30..0}; do
+		if docker_process_sql "${extraArgs[@]}" --database=mysql <<<'SELECT 1' &> /dev/null; then
+			break
+		fi
+		sleep 1
+	done
+	if [ "$i" = 0 ]; then
+		mysql_error "Unable to start server."
+	fi
+}
 
-exec "$@"
+# Stop the server. When using a local socket file mysqladmin will block until
+# the shutdown is complete.
+docker_temp_server_stop() {
+	if ! MYSQL_PWD=$MARIADB_ROOT_PASSWORD mysqladmin shutdown -uroot --socket="${SOCKET}"; then
+		mysql_error "Unable to shut down server."
+	fi
+}
+
+# Verify that the minimally required password settings are set for new databases.
+docker_verify_minimum_env() {
+	if [ -z "$MARIADB_ROOT_PASSWORD" -a -z "$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" -a -z "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then
+		mysql_error $'Database is uninitialized and password option is not specified\n\tYou need to specify one of MARIADB_ROOT_PASSWORD, MARIADB_ALLOW_EMPTY_ROOT_PASSWORD and MARIADB_RANDOM_ROOT_PASSWORD'
+	fi
+}
+
+# creates folders for the database
+# also ensures permission for user mysql of run as root
+docker_create_db_directories() {
+	local user; user="$(id -u)"
+
+	# TODO other directories that are used by default? like /var/lib/mysql-files
+	# see https://github.com/docker-library/mysql/issues/562
+	mkdir -p "$DATADIR"
+
+	if [ "$user" = "0" ]; then
+		# this will cause less disk access than `chown -R`
+		find "$DATADIR" \! -user mysql -exec chown mysql '{}' +
+		# See https://github.com/MariaDB/mariadb-docker/issues/363
+		find "${SOCKET%/*}" -maxdepth 0 \! -user mysql -exec chown mysql '{}' \;
+	fi
+}
+
+# initializes the database directory
+docker_init_database_dir() {
+	mysql_note "Initializing database files"
+	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
+	if { mysql_install_db --help || :; } | grep -q -- '--skip-test-db'; then
+		# 10.3+
+		installArgs+=( --skip-test-db )
+	fi
+	# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
+	mysql_install_db "${installArgs[@]}" "${@:2}" --default-time-zone=SYSTEM --enforce-storage-engine=
+	mysql_note "Database files initialized"
+}
+
+# Loads various settings that are used elsewhere in the script
+# This should be called after mysql_check_config, but before any other functions
+docker_setup_env() {
+	# Get config
+	declare -g DATADIR SOCKET
+	DATADIR="$(mysql_get_config 'datadir' "$@")"
+	SOCKET="$(mysql_get_config 'socket' "$@")"
+
+
+	# Initialize values that might be stored in a file
+	_mariadb_file_env 'MYSQL_ROOT_HOST' '%'
+	_mariadb_file_env 'MYSQL_DATABASE'
+	_mariadb_file_env 'MYSQL_USER'
+	_mariadb_file_env 'MYSQL_PASSWORD'
+	_mariadb_file_env 'MYSQL_ROOT_PASSWORD'
+
+	# set MARIADB_ from MYSQL_ when it is unset and then make them the same value
+	: "${MARIADB_ALLOW_EMPTY_ROOT_PASSWORD:=${MYSQL_ALLOW_EMPTY_PASSWORD:-}}"
+	export MYSQL_ALLOW_EMPTY_PASSWORD="$MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" MARIADB_ALLOW_EMPTY_ROOT_PASSWORD
+	: "${MARIADB_RANDOM_ROOT_PASSWORD:=${MYSQL_RANDOM_ROOT_PASSWORD:-}}"
+	export MYSQL_RANDOM_ROOT_PASSWORD="$MARIADB_RANDOM_ROOT_PASSWORD" MARIADB_RANDOM_ROOT_PASSWORD
+	: "${MARIADB_INITDB_SKIP_TZINFO:=${MYSQL_INITDB_SKIP_TZINFO:-}}"
+	export MYSQL_INITDB_SKIP_TZINFO="$MARIADB_INITDB_SKIP_TZINFO" MARIADB_INITDB_SKIP_TZINFO
+
+	declare -g DATABASE_ALREADY_EXISTS
+	if [ -d "$DATADIR/mysql" ]; then
+		DATABASE_ALREADY_EXISTS='true'
+	fi
+}
+
+# Execute the client, use via docker_process_sql to handle root password
+docker_exec_client() {
+	# args sent in can override this db, since they will be later in the command
+	if [ -n "$MYSQL_DATABASE" ]; then
+		set -- --database="$MYSQL_DATABASE" "$@"
+	fi
+	mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" "$@"
+}
+
+# Execute sql script, passed via stdin
+# usage: docker_process_sql [--dont-use-mysql-root-password] [mysql-cli-args]
+#    ie: docker_process_sql --database=mydb <<<'INSERT ...'
+#    ie: docker_process_sql --dont-use-mysql-root-password --database=mydb <my-file.sql
+docker_process_sql() {
+	passfileArgs=()
+	if [ '--dont-use-mysql-root-password' = "$1" ]; then
+		shift
+		MYSQL_PWD= docker_exec_client "$@"
+	else
+		MYSQL_PWD=$MARIADB_ROOT_PASSWORD docker_exec_client "$@"
+	fi
+}
+
+# SQL escape the string $1 to be placed in a string literal.
+# escape, \ followed by '
+docker_sql_escape_string_literal() {
+	local newline=$'\n'
+	local escaped=${1//\\/\\\\}
+	escaped="${escaped//$newline/\\n}"
+	echo "${escaped//\'/\\\'}"
+}
+
+# Initializes database with timezone info and root password, plus optional extra db/user
+docker_setup_db() {
+	# Load timezone info into database
+	if [ -z "$MARIADB_INITDB_SKIP_TZINFO" ]; then
+		{
+			# Aria in 10.4+ is slow due to "transactional" (crash safety)
+			# https://jira.mariadb.org/browse/MDEV-23326
+			# https://github.com/docker-library/mariadb/issues/262
+			local tztables=( time_zone time_zone_leap_second time_zone_name time_zone_transition time_zone_transition_type )
+			for table in "${tztables[@]}"; do
+				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
+			done
+
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
+			mariadb-tzinfo-to-sql /usr/share/zoneinfo \
+				| sed 's/Local time zone must be set--see zic manual page/FCTY/'
+
+			for table in "${tztables[@]}"; do
+				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"
+			done
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
+		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
+	fi
+	# Generate random root password
+	if [ -n "$MARIADB_RANDOM_ROOT_PASSWORD" ]; then
+		MARIADB_ROOT_PASSWORD="$(pwgen --numerals --capitalize --symbols --remove-chars="'\\" -1 32)"
+		export MARIADB_ROOT_PASSWORD MYSQL_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
+		mysql_note "GENERATED ROOT PASSWORD: $MARIADB_ROOT_PASSWORD"
+	fi
+	# Sets root password and creates root users for non-localhost hosts
+	local rootCreate=
+	local rootPasswordEscaped
+	rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" )
+
+	# default root to listen for connections from anywhere
+	if [ -n "$MARIADB_ROOT_HOST" ] && [ "$MARIADB_ROOT_HOST" != 'localhost' ]; then
+		# no, we don't care if read finds a terminating character in this heredoc
+		# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
+		read -r -d '' rootCreate <<-EOSQL || true
+			CREATE USER 'root'@'${MARIADB_ROOT_HOST}' IDENTIFIED BY '${rootPasswordEscaped}' ;
+			GRANT ALL ON *.* TO 'root'@'${MARIADB_ROOT_HOST}' WITH GRANT OPTION ;
+		EOSQL
+	fi
+
+	# tell docker_process_sql to not use MARIADB_ROOT_PASSWORD since it is just now being set
+	# --binary-mode to save us from the semi-mad users go out of their way to confuse the encoding.
+	docker_process_sql --dont-use-mysql-root-password --database=mysql --binary-mode <<-EOSQL
+		-- What's done in this file shouldn't be replicated
+		--  or products like mysql-fabric won't work
+		SET @@SESSION.SQL_LOG_BIN=0;
+                -- we need the SQL_MODE NO_BACKSLASH_ESCAPES mode to be clear for the password to be set
+		SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
+
+		DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mariadb.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ;
+		SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${rootPasswordEscaped}') ;
+		-- 10.1: https://github.com/MariaDB/server/blob/d925aec1c10cebf6c34825a7de50afe4e630aff4/scripts/mysql_secure_installation.sh#L347-L365
+		-- 10.5: https://github.com/MariaDB/server/blob/00c3a28820c67c37ebbca72691f4897b57f2eed5/scripts/mysql_secure_installation.sh#L351-L369
+		DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%' ;
+
+		GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION ;
+		FLUSH PRIVILEGES ;
+		${rootCreate}
+		DROP DATABASE IF EXISTS test ;
+	EOSQL
+
+	# Creates a custom database and user if specified
+	if [ -n "$MARIADB_DATABASE" ]; then
+		mysql_note "Creating database ${MARIADB_DATABASE}"
+		docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;"
+	fi
+
+	#modifed
+	for dbName in "${hidcheDBList[@]}"; do
+		local fullDBName
+		local subPW
+		fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
+		mysql_note "Creating database ${fullDBName}"
+		subPW=`echo -n ${dbName}${HIDCHE_PW_SALT}${MARIADB_ROOT_PASSWORD}${dbName}${HIDCHE_PW_SALT} | shasum -a 512`
+		subPW=${subPW:0:32}
+		local userPasswordEscaped
+		userPasswordEscaped=$( docker_sql_escape_string_literal "${subPW}" )
+
+		docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$fullDBName\` ;"
+		docker_process_sql --database=mysql --binary-mode <<-EOSQL_SUBDB
+			SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
+			CREATE USER '$fullDBName'@'%' IDENTIFIED BY '$userPasswordEscaped';
+		EOSQL_SUBDB
+		docker_process_sql --database=mysql <<<"GRANT ALL ON \`${fullDBName//_/\\_}\`.* TO '$fullDBName'@'%' ;"
+	done
+
+	if [ -n "$HIDCHE_DB_BBS_USER" ] && [ -n "$HIDCHE_DB_BBS_PASSWORD" ]; then
+		local fullBBS_DBName
+		fullBBS_DBName="${HIDCHE_DB_PREFIX}_board"
+		mysql_note "Creating database ${fullBBS_DBName}"
+		docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$fullBBS_DBName\` ;"
+
+		mysql_note "Creating user ${HIDCHE_DB_BBS_USER}"
+		# SQL escape the user password, \ followed by '
+		local userPasswordEscaped
+		userPasswordEscaped=$( docker_sql_escape_string_literal "${HIDCHE_DB_BBS_PASSWORD}" )
+		docker_process_sql --database=mysql --binary-mode <<-EOSQL_USER
+			SET @@SESSION.SQL_MODE=REPLACE(@@SESSION.SQL_MODE, 'NO_BACKSLASH_ESCAPES', '');
+			CREATE USER '$HIDCHE_DB_BBS_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';
+		EOSQL_USER
+		docker_process_sql --database=mysql <<<"GRANT ALL ON \`${fullBBS_DBName//_/\\_}\`.* TO '$HIDCHE_DB_BBS_USER'@'%' ;"
+	fi
+}
+
+# check arguments for an option that would cause mariadbd to stop
+# return true if there is one
+_mysql_want_help() {
+	local arg
+	for arg; do
+		case "$arg" in
+			-'?'|--help|--print-defaults|-V|--version)
+				return 0
+				;;
+		esac
+	done
+	return 1
+}
+
+_main() {
+	# if command starts with an option, prepend mysqld
+	if [ "${1:0:1}" = '-' ]; then
+		set -- mariadbd "$@"
+	fi
+
+	# skip setup if they aren't running mariadbd or want an option that stops mysqld
+	if [ "$1" = 'mariadbd' ] || [ "$1" = 'mysqld' ] && ! _mysql_want_help "$@"; then
+		mysql_note "Entrypoint script for MariaDB Server ${MARIADB_VERSION} started."
+
+		mysql_check_config "$@"
+		# Load various environment variables
+		docker_setup_env "$@"
+		docker_create_db_directories
+
+		# If container is started as root user, restart as dedicated mysql user
+		if [ "$(id -u)" = "0" ]; then
+			mysql_note "Switching to dedicated user 'mysql'"
+			exec gosu mysql "$BASH_SOURCE" "$@"
+		fi
+
+		# there's no database, so it needs to be initialized
+		if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
+			docker_verify_minimum_env
+
+			# check dir permissions to reduce likelihood of half-initialized database
+			ls /docker-entrypoint-initdb.d/ > /dev/null
+
+			docker_init_database_dir "$@"
+
+			mysql_note "Starting temporary server"
+			docker_temp_server_start "$@"
+			mysql_note "Temporary server started."
+
+			docker_setup_db
+			docker_process_init_files /docker-entrypoint-initdb.d/*
+
+			mysql_note "Stopping temporary server"
+			docker_temp_server_stop
+			mysql_note "Temporary server stopped"
+
+			echo
+			mysql_note "MariaDB init process with HIDCHE done. Ready for start up."
+			echo
+		fi
+	fi
+	exec "$@"
+}
+
+# If we are sourced from elsewhere, don't perform any further actions
+if ! _is_sourced; then
+	_main "$@"
+fi

hidche/docker-compose.yml

@@ -13,8 +13,9 @@ services:
   web:
     build: ./web
     restart: always
-    ports:
+    #ports:
-      - 8080:80
+    # 기본 포트로 사용할 곳 지정. 아래와 같이 사용하면 8080
+    #  - 8080:80
     volumes:
       - hidche:/var/www/html:ro
       - board:/var/www/board:ro

hidche/example.docker-compose.override.yml

@@ -25,7 +25,7 @@ services:
         target: /var/www/html
         #For DEV. Set app path as local directory
       - type: bind
-        source: ~/dev_sam/bbs
+        source: ~/dev_sam/board
         target: /var/www/board
 
   app:

hidche/game.orig.env

@@ -2,6 +2,7 @@
 #서버 git 주소.
 #만약 https:// 대신 ssh://로 시작하는 주소를 사용하는 경우 app/id_ecdsa, app/known_host 에 ecdsa 개인키와 ssh값을 추가할 것.
 gameGitPath=ssh://git@storage.hided.net:2525/devsam/core.git
+gameGitBranch=devel
 imgGitPath=ssh://git@storage.hided.net:2525/devsam/image.git
 
 #게임 시간대.

hidche/install/install_hidche.py

@@ -43,14 +43,18 @@ if not os.path.exists(indexPHP):
     fp.close()
 
 while True:
-    try: 
+    try:
         r = requests.head('http://web/sam/f_install/j_install_status.php')
-        if r.status_code == 200:
+        if r.status_code == 503 or r.status_code == 500:
+            b = requests.get('http://web/sam/install.php', timeout=60000)
+        elif r.status_code == 200:
             break
     except Exception:
         pass
     print("Waiting for web connection...", flush=True)
-    time.sleep(2)        
+    time.sleep(2)
+
+requests.get('http://web/sam/install.php', timeout=60000) #NPM
 
 while True:
     result = subprocess.call('nc -z -v -w30 db 3306'.split(' '), stderr=subprocess.STDOUT)
@@ -61,9 +65,10 @@ while True:
 
 session = requests.session()
 
-db_root_pw = hash_password('root'+env['HIDCHE_PW_SALT'], env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
+db_root_pw = hash_password('root'+env['HIDCHE_PW_SALT'], env['MARIADB_ROOT_PASSWORD'])[:32]
 db_root_name = '%s_root'%env['HIDCHE_DB_PREFIX']
 
+print("Setup DB...", flush=True)
 setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
     'db_host':'db',
     'db_port':3306,
@@ -77,7 +82,7 @@ setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
     'kakao_admin_key':env['HIDCHE_KAKAO_ADMIN_KEY'],
 }, headers=headers)
 setupDBJsonResult = json.loads(setupDBResult.text)
-print(setupDBJsonResult)
+print(setupDBJsonResult, flush=True)
 
 globalSalt = setupDBJsonResult['globalSalt']
 
@@ -88,23 +93,31 @@ query = {
     'password':hashPassword,
     'nickname':'운영자'
 }
+
+print("Create Admin...", flush=True)
 setupAdminResult = session.post('http://web/sam/f_install/j_create_admin.php', query, headers=headers)
 setupAdminJsonResult = json.loads(setupAdminResult.text)
-print(setupAdminJsonResult)
+print(setupAdminJsonResult, flush=True)
 
-loginResult = session.post('http://web/sam/j_login.php', query, headers=headers)
+jsonQuery = {
-print(loginResult.text)
+    "path": ["Login", "LoginByID"],
+    "args": query
+}
+
+print("Login Admin...", flush=True)
+loginResult = session.post('http://web/sam/api.php', json=jsonQuery)
+print(loginResult.text, flush=True)
 
 serverList = str(env['HIDCHE_SERVER_LIST']).split(',')
 serverList.reverse()
 for serverName in serverList:
     updateResult = session.post('http://web/sam/j_updateServer.php', {
         'server':serverName,
-        'target':'origin/devel'
+        'target':'origin/'+env['gameGitBranch']
-    }, headers=headers)
+    }, headers=headers, timeout=60000)
-    print(serverName, updateResult.text)
+    print(serverName, updateResult.text, flush=True)
 
-    db_pw = hash_password(serverName+env['HIDCHE_PW_SALT'], env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
+    db_pw = hash_password(serverName+env['HIDCHE_PW_SALT'], env['MARIADB_ROOT_PASSWORD'])[:32]
     db_name = '%s_%s'%(env['HIDCHE_DB_PREFIX'], serverName)
     resetResult = session.post('http://web/sam/%s/j_install_db.php'%serverName, {
         'db_host':'db',
@@ -113,7 +126,7 @@ for serverName in serverList:
         'db_pw':db_pw,
         'db_name':db_name,
     }, headers=headers)
-    print(serverName, resetResult.text)
+    print(serverName, resetResult.text, flush=True)
 
 if useWaitIndex:
     fp = open(indexPHP, 'wt', encoding='utf-8')
@@ -121,4 +134,4 @@ if useWaitIndex:
     fp.close()
     os.chown(indexPHP, 33, 33)
 
-print('Welcome to HIDCHE')
+print('Welcome to HIDCHE', flush=True)

hidche/web/Dockerfile

@@ -14,6 +14,7 @@ RUN if [ "$UID" != 33 ]; then  \
     fi;
 
 COPY ./default.conf /etc/nginx/conf.d/default.conf
+COPY ./sam.conf /etc/nginx/snippets/sam.conf
 COPY ./rhymix.conf /etc/nginx/snippets/rhymix.conf
 
 VOLUME /var/www/html

hidche/web/default.conf

@@ -30,6 +30,7 @@ server {
     }
 
     location / {
+        include snippets/sam.conf;
         location ~ \.php$ {
             include        fastcgi_params;
             proxy_read_timeout 600;

hidche/web/sam.conf

@@ -0,0 +1,68 @@
+location ~ /\.  {
+    return 404;
+}
+
+location ~ /composer  {
+    return 404;
+}
+
+location ~ /package\.(json|lock)  {
+    return 404;
+}
+
+
+location ~ /d_setting/  {
+    return 404;
+}
+
+location ~ /d_log/  {
+    return 404;
+}
+
+location ~ /logs/  {
+    return 404;
+}
+
+location ~ ^/sam/node_modules  {
+    return 404;
+}
+
+location ~ ^/sam/vendor/  {
+    return 404;
+}
+
+location ~ /tests  {
+    return 404;
+}
+
+location ~ /test-ts  {
+    return 404;
+}
+
+location ~ /npm_recent  {
+    return 404;
+}
+
+location ~ /composer_result  {
+    return 404;
+}
+
+location ~ /tsconfig.json  {
+    return 404;
+}
+
+location ~ /webpack.config.js  {
+    return 404;
+}
+
+location ~ /src {
+    return 404;
+}
+
+location ~ ^/sam/[^/]+/sammo/ {
+    return 404;
+}
+
+location ~ ^/sam/[^/]+/data/ {
+    return 404;
+}