Merge branch 'master' into patch-1

elastic · Jun 29, 2021 · 951d000 · 951d000
2 parents 29f2d23 + 277033d
commit 951d000
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.ci/docker/docker-compose.yml b/.ci/docker/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 30
 
   mssql:
-    image: microsoft/mssql-server-linux
+    image: mcr.microsoft.com/mssql/server
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Very(!)Secure

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -82,7 +82,7 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: 1
 
       mssql:
-        image: microsoft/mssql-server-linux
+        image: mcr.microsoft.com/mssql/server
         env:
           ACCEPT_EULA: 'Y'
           SA_PASSWORD: 'Very(!)Secure'

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+Thanks for your interest in the security of our products.
+Our security policy can be found at [https://www.elastic.co/community/security](https://www.elastic.co/community/security).
+
+## Reporting a Vulnerability
+Please send security vulnerability reports to security@elastic.co.
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 30
 
   mssql:
-    image: microsoft/mssql-server-linux
+    image: mcr.microsoft.com/mssql/server
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=Very(!)Secure