diff --git a/samples/containers/replication/db1/Dockerfile b/samples/containers/replication/db1/Dockerfile index 84fe284e..e3b32a82 100644 --- a/samples/containers/replication/db1/Dockerfile +++ b/samples/containers/replication/db1/Dockerfile @@ -1,6 +1,5 @@ -FROM mcr.microsoft.com/mssql/server:2019-CTP3.0-ubuntu - -COPY . / - -RUN chmod +x /db-init.sh +FROM mcr.microsoft.com/mssql/rhel/server:2019-CTP3.1 +COPY . / + +RUN chmod +x /db-init.sh CMD /bin/bash ./entrypoint.sh \ No newline at end of file diff --git a/samples/containers/replication/db1/db-init.sh b/samples/containers/replication/db1/db-init.sh index aa83da97..be17defd 100644 --- a/samples/containers/replication/db1/db-init.sh +++ b/samples/containers/replication/db1/db-init.sh @@ -5,7 +5,6 @@ mkdir /var/opt/mssql/ReplData/ chown mssql /var/opt/mssql/ReplData/ chgrp mssql /var/opt/mssql/ReplData/ - echo "running set up script" #run the setup script to create the DB and the schema in the DB -/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P MssqlPass123 -d master -i db-init.sql \ No newline at end of file +/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P MssqlPass123 -d master -i db-init.sql diff --git a/samples/containers/replication/db1/entrypoint.sh b/samples/containers/replication/db1/entrypoint.sh index 4a6e4fe6..7e96fe1f 100644 --- a/samples/containers/replication/db1/entrypoint.sh +++ b/samples/containers/replication/db1/entrypoint.sh @@ -2,4 +2,5 @@ #You need a non-terminating process to keep the container alive. #In a series of commands separated by single ampersands the commands to the left of the right-most ampersand are run in the background. #So - if you are executing a series of commands simultaneously using single ampersands, the command at the right-most position needs to be non-terminating - /db-init.sh & /opt/mssql/bin/sqlservr \ No newline at end of file + /db-init.sh & /opt/mssql/bin/sqlservr + \ No newline at end of file diff --git a/samples/containers/replication/db2/Dockerfile b/samples/containers/replication/db2/Dockerfile index 84fe284e..778ca3d9 100644 --- a/samples/containers/replication/db2/Dockerfile +++ b/samples/containers/replication/db2/Dockerfile @@ -1,6 +1,6 @@ -FROM mcr.microsoft.com/mssql/server:2019-CTP3.0-ubuntu - -COPY . / - -RUN chmod +x /db-init.sh +FROM mcr.microsoft.com/mssql/rhel/server:2019-CTP3.1 + +COPY . / + +RUN chmod +x /db-init.sh CMD /bin/bash ./entrypoint.sh \ No newline at end of file diff --git a/samples/containers/replication/db2/db-init.sh b/samples/containers/replication/db2/db-init.sh index eed9da31..35e86c6f 100644 --- a/samples/containers/replication/db2/db-init.sh +++ b/samples/containers/replication/db2/db-init.sh @@ -3,4 +3,4 @@ sleep 20s echo "running set up script" #run the setup script to create the DB and the schema in the DB -/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P MssqlPass123 -d master -i db-init.sql \ No newline at end of file +/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P MssqlPass123 -d master -i db-init.sql