Skip to content

Commit 5eee5b4

Browse files
🔨 Move database data into a volume.
Why? To avoid cluttering the repo with private mssql content.
1 parent 69edb7b commit 5eee5b4

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

db/bin/configure-db.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ DBSTATUS=1
99
ERRCODE=1
1010
i=0
1111

12-
while [[ $DBSTATUS -ne 0 ]] && [[ $i -lt 60 ]] && [[ $ERRCODE -ne 0 ]]; do
13-
i=$i+1
12+
while [[ $DBSTATUS -ne 0 ]] && [[ $i -lt 3600 ]] && [[ $ERRCODE -ne 0 ]]; do
13+
i=$i+5
1414
DBSTATUS=$(/opt/mssql-tools/bin/sqlcmd -h -1 -t 1 -U sa -P "$MSSQL_SA_PASSWORD" -Q "SET NOCOUNT ON; Select SUM(state) from sys.databases WHERE name = 'master'")
1515
ERRCODE=$?
16-
sleep 1
16+
sleep 5
1717
done
1818

1919
if [[ $DBSTATUS -ne 0 ]] || [[ $ERRCODE -ne 0 ]]; then
20-
echo "SQL Server took more than 60 seconds to start up, master database is not in an ONLINE state"
20+
echo "SQL Server took more than 3600 seconds to start up, master database is not in an ONLINE state"
2121
exit 1
2222
fi
2323

db/db.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ USER mssql
88
WORKDIR /usr/src/db
99

1010
# Data
11-
# COPY ./db/data /var/opt/mssql/data
1211
# COPY ./db/log /var/opt/mssql/log
13-
# COPY ./db/backups /var/opt/mssql/data/backups
12+
COPY ./db/backups /var/opt/mssql/data/backups
1413

1514
# Intialization
1615
COPY --chown=mssql:root --chmod=+x ./db/entrypoint.sh ./

docker-compose.development.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ services:
5757
volumes:
5858
- ./db/bin:/usr/src/db/bin
5959
- ./db/initializers:/usr/src/db/initializers
60-
- ./db/data:/var/opt/mssql/data
60+
- db_data:/var/opt/mssql/data
6161
- ./db/log:/var/opt/mssql/log
6262
- ./db/backups:/var/opt/mssql/data/backups
6363
healthcheck: # https://github.com/Microsoft/mssql-docker/issues/133
@@ -86,4 +86,5 @@ services:
8686
- 8085:8085
8787

8888
volumes:
89+
db_data:
8990
s3storage:

0 commit comments

Comments
 (0)