Skip to content

Commit c68bbd4

Browse files
authored
Merge pull request laradock#2422 from rmeira/master
Update MSSQL image
2 parents 713799c + 0da0f30 commit c68bbd4

6 files changed

Lines changed: 4 additions & 27 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ services:
424424
build:
425425
context: ./mssql
426426
environment:
427+
- MSSQL_PID=Express
427428
- MSSQL_DATABASE=${MSSQL_DATABASE}
428429
- SA_PASSWORD=${MSSQL_PASSWORD}
429430
- ACCEPT_EULA=Y

env-example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d
294294

295295
### MSSQL #################################################
296296

297-
MSSQL_DATABASE=homestead
297+
MSSQL_DATABASE=master
298298
MSSQL_PASSWORD=yourStrong(!)Password
299299
MSSQL_PORT=1433
300300

mssql/Dockerfile

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
FROM microsoft/mssql-server-linux
2-
3-
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
4-
5-
# Create config directory
6-
# an set it as WORKDIR
7-
RUN mkdir -p /usr/src/app
8-
WORKDIR /usr/src/app
9-
10-
# Bundle app source
11-
COPY . /usr/src/app
12-
13-
RUN chmod +x /usr/src/app/create_table.sh
1+
FROM mcr.microsoft.com/mssql/server:2017-latest-ubuntu
142

3+
ENV MSSQL_PID=Express
154
ENV MSSQL_DATABASE=$MSSQL_DATABASE
165
ENV ACCEPT_EULA=Y
176
ENV SA_PASSWORD=$MSSQL_PASSWORD
187

198
VOLUME /var/opt/mssql
209

2110
EXPOSE 1433
22-
23-
CMD /bin/bash ./entrypoint.sh

mssql/create_table.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

mssql/entrypoint.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

mssql/setup.sql

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)