Skip to content

Commit ed459a8

Browse files
authored
Merge pull request #4329 from esl/pin-mssql-docker-image
Pin mssql docker version
2 parents 65aadba + 6ffa354 commit ed459a8

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

.circleci/template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ containers:
7676
- ENV_FILE_DHSERVER_DATA: "__MIM_DHSERVER__"
7777
entrypoint: *ENTRYPOINT
7878
- &mssql_container
79-
image: mcr.microsoft.com/mssql/server
79+
image: mcr.microsoft.com/mssql/server:__MSSQL_VERSION__
8080
environment:
8181
- ACCEPT_EULA: Y
8282
- SA_PASSWORD: "mongooseim_secret+ESL123"

tools/circle-generate-config.sh

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ sed -e "s/__MYSQL_CNF__/${MYSQL_CNF}/" \
4646
-e "s/__PGSQL_VERSION__/${PGSQL_VERSION}/g" \
4747
-e "s/__MSSQL_SQL__/${MSSQL_SQL}/" \
4848
-e "s/__MSSQL_SETUP__/${MSSQL_SETUP}/" \
49+
-e "s/__MSSQL_VERSION__/${MSSQL_VERSION}/" \
4950
-e "s/__REDIS_VERSION__/${REDIS_VERSION}/" \
5051
-e "s/__LDAP_SCHEMA__/${LDAP_SCHEMA}/" \
5152
-e "s/__LDAP_SETUP__/${LDAP_SETUP}/" \

tools/db-versions.sh

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ MYSQL_VERSION_DEFAULT="8.0.30"
77

88
PGSQL_VERSION_DEFAULT=latest
99

10+
MSSQL_VERSION_DEFAULT="2022-CU12-ubuntu-22.04"
11+
1012
LDAP_VERSION_DEFAULT="1.5.0"
1113

1214
REDIS_VERSION_DEFAULT="7.2.1"
@@ -25,6 +27,8 @@ MYSQL_VERSION=${MYSQL_VERSION:-$MYSQL_VERSION_DEFAULT}
2527

2628
PGSQL_VERSION=${PGSQL_VERSION:-$PGSQL_VERSION_DEFAULT}
2729

30+
MSSQL_VERSION=${MSSQL_VERSION:-$MSSQL_VERSION_DEFAULT}
31+
2832
LDAP_VERSION=${LDAP_VERSION:-$LDAP_VERSION_DEFAULT}
2933

3034
REDIS_VERSION=${REDIS_VERSION:-$REDIS_VERSION_DEFAULT}

tools/setup-db.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function setup_db(){
234234
# Error 87(The parameter is incorrect.) occurred while opening file '/var/opt/mssql/data/master.mdf'
235235
MSSQL_SQL=$(cat32 priv/mssql2012.sql)
236236
MSSQL_SETUP=$(cat32 tools/docker-setup-mssql.sh)
237-
IMAGE=mcr.microsoft.com/mssql/server
237+
IMAGE=mcr.microsoft.com/mssql/server:$MSSQL_VERSION
238238
$DOCKER run -d --name=$NAME \
239239
-p $MSSQL_PORT:1433 \
240240
--user root \

0 commit comments

Comments
 (0)