From 3ba74dd1c31338b1beb313df5eb08713f2032a4b Mon Sep 17 00:00:00 2001 From: Rafael Meira Date: Tue, 10 Dec 2019 11:07:58 -0300 Subject: [PATCH 1/6] Update pid for sql MSSQL --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 7c469df4..c544f2ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -419,6 +419,7 @@ services: build: context: ./mssql environment: + - MSSQL_PID=Express - MSSQL_DATABASE=${MSSQL_DATABASE} - SA_PASSWORD=${MSSQL_PASSWORD} - ACCEPT_EULA=Y From 77c8429ea13eea280fcc59092eb892ff2d4a4855 Mon Sep 17 00:00:00 2001 From: Rafael Meira Date: Tue, 10 Dec 2019 11:10:32 -0300 Subject: [PATCH 2/6] Update dockerfile add new version from mssql --- mssql/Dockerfile | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/mssql/Dockerfile b/mssql/Dockerfile index 2d9e5ac9..c777500e 100644 --- a/mssql/Dockerfile +++ b/mssql/Dockerfile @@ -1,17 +1,6 @@ -FROM microsoft/mssql-server-linux - -LABEL maintainer="Mahmoud Zalt " - -# Create config directory -# an set it as WORKDIR -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -# Bundle app source -COPY . /usr/src/app - -RUN chmod +x /usr/src/app/create_table.sh +FROM mcr.microsoft.com/mssql/server:2017-latest-ubuntu +ENV MSSQL_PID=Express ENV MSSQL_DATABASE=$MSSQL_DATABASE ENV ACCEPT_EULA=Y ENV SA_PASSWORD=$MSSQL_PASSWORD @@ -19,5 +8,3 @@ ENV SA_PASSWORD=$MSSQL_PASSWORD VOLUME /var/opt/mssql EXPOSE 1433 - -CMD /bin/bash ./entrypoint.sh From 0edeb8fb71ccdc898aeb45a8f3a862bced721621 Mon Sep 17 00:00:00 2001 From: Rafael Meira Date: Tue, 10 Dec 2019 11:11:11 -0300 Subject: [PATCH 3/6] remove this file --- mssql/create_table.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 mssql/create_table.sh diff --git a/mssql/create_table.sh b/mssql/create_table.sh deleted file mode 100644 index 9fe5214c..00000000 --- a/mssql/create_table.sh +++ /dev/null @@ -1,5 +0,0 @@ -#wait for the SQL Server to come up -sleep 45 - -#run the setup script to create the DB and the schema in the DB -/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -i setup.sql \ No newline at end of file From 44f1d456b2857b62a6272d7dff03b4fa9d4845f2 Mon Sep 17 00:00:00 2001 From: Rafael Meira Date: Tue, 10 Dec 2019 11:11:32 -0300 Subject: [PATCH 4/6] remove this file --- mssql/entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 mssql/entrypoint.sh diff --git a/mssql/entrypoint.sh b/mssql/entrypoint.sh deleted file mode 100644 index 062293b8..00000000 --- a/mssql/entrypoint.sh +++ /dev/null @@ -1,2 +0,0 @@ -#start SQL Server, start the script to create the DB and import the data, start the app -/opt/mssql/bin/sqlservr & /usr/src/app/create_table.sh & tail -f /dev/null From a010010d974fff94203d6c2dc3727134bc68e05b Mon Sep 17 00:00:00 2001 From: Rafael Meira Date: Tue, 10 Dec 2019 11:11:54 -0300 Subject: [PATCH 5/6] remove this file use master --- mssql/setup.sql | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 mssql/setup.sql diff --git a/mssql/setup.sql b/mssql/setup.sql deleted file mode 100644 index f453c778..00000000 --- a/mssql/setup.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE DATABASE $(MSSQL_DATABASE); -GO -USE $(MSSQL_DATABASE); -GO \ No newline at end of file From 0da0f302d3fad679ad8c593376d7d9c8d1808731 Mon Sep 17 00:00:00 2001 From: Rafael Meira Date: Tue, 10 Dec 2019 11:12:53 -0300 Subject: [PATCH 6/6] Update env-example --- env-example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env-example b/env-example index d5388433..656233e2 100644 --- a/env-example +++ b/env-example @@ -291,7 +291,7 @@ PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d ### MSSQL ################################################# -MSSQL_DATABASE=homestead +MSSQL_DATABASE=master MSSQL_PASSWORD=yourStrong(!)Password MSSQL_PORT=1433