Skip to content

Commit 10db33a

Browse files
committed
Changed SEMAPHORE_DB_DIALECT to text
1 parent c435188 commit 10db33a

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

deployment/docker/ci/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
context: ./../../../
2121
dockerfile: ./deployment/docker/ci/Dockerfile
2222
environment:
23-
SEMAPHORE_DB_DIALECT: 1
23+
SEMAPHORE_DB_DIALECT: mysql
2424
SEMAPHORE_DB_USER: semaphore
2525
SEMAPHORE_DB_PASS: semaphore
2626
SEMAPHORE_DB_HOST: mysql

deployment/docker/common/semaphore-wrapper

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}"
88
SEMAPHORE_TMP_PATH="${SEMAPHORE_TMP_PATH:-/tmp/semaphore}"
99

1010
# Semaphore database env config
11-
SEMAPHORE_DB_DIALECT="${SEMAPHORE_DB_DIALECT:-1}"
11+
SEMAPHORE_DB_DIALECT="${SEMAPHORE_DB_DIALECT:-mysql}"
12+
SEMAPHORE_DB_DIALECT_ID=1
1213
SEMAPHORE_DB_HOST="${SEMAPHORE_DB_HOST:-0.0.0.0}"
1314
SEMAPHORE_DB_PORT="${SEMAPHORE_DB_PORT:-3306}"
1415
SEMAPHORE_DB="${SEMAPHORE_DB:-semaphore}"
@@ -59,12 +60,17 @@ while ! $(nc -z "$SEMAPHORE_DB_HOST" "$SEMAPHORE_DB_PORT") >/dev/null 2>&1; do
5960
sleep 1
6061
done
6162

63+
case ${SEMAPHORE_DB_DIALECT} in
64+
"mysql") SEMAPHORE_DB_DIALECT_ID=1;;
65+
"bolt") SEMAPHORE_DB_DIALECT_ID=2;;
66+
"postgres") SEMAPHORE_DB_DIALECT_ID=3;;
67+
esac
6268

6369
# Create a config if it does not exist in the current config path
6470
if [ ! -f "${SEMAPHORE_CONFIG_PATH}/config.json" ]; then
6571
echoerr "Generating ${SEMAPHORE_TMP_PATH}/config.stdin ..."
6672
cat << EOF > "${SEMAPHORE_TMP_PATH}/config.stdin"
67-
${SEMAPHORE_DB_DIALECT}
73+
${SEMAPHORE_DB_DIALECT_ID}
6874
${SEMAPHORE_DB_HOST}:${SEMAPHORE_DB_PORT}
6975
${SEMAPHORE_DB_USER}
7076
${SEMAPHORE_DB_PASS}

deployment/docker/dev/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
volumes:
2323
- "./../../../:/go/src/github.com/ansible-semaphore/semaphore:rw"
2424
environment:
25-
SEMAPHORE_DB_DIALECT: 1
25+
SEMAPHORE_DB_DIALECT: mysql
2626
SEMAPHORE_DB_USER: semaphore
2727
SEMAPHORE_DB_PASS: semaphore
2828
SEMAPHORE_DB_HOST: mysql

deployment/docker/prod/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
context: ./../../../
1919
dockerfile: ./deployment/docker/prod/Dockerfile
2020
environment:
21-
SEMAPHORE_DB_DIALECT: 1
21+
SEMAPHORE_DB_DIALECT: mysql
2222
SEMAPHORE_DB_USER: semaphore
2323
SEMAPHORE_DB_PASS: hx4hjxqthfwbfsy5535u4agfdscm
2424
SEMAPHORE_DB_HOST: mysql

0 commit comments

Comments
 (0)