Merge pull request rundeck#28 from rundeck/sqlserver-update

Update sqlserver example
lighty · May 25, 2022 · 49f3d74 · 49f3d74
2 parents 5edf7be + 09467e9
commit 49f3d74
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/sqlserver/.env.dist b/sqlserver/.env.dist
@@ -1,3 +1,3 @@
 ## Set pro options if applicable
-# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT
+# RUNDECK_IMAGE=rundeckpro/enterprise:SNAPSHOT
 # RUNDECK_LICENSE_FILE=
diff --git a/sqlserver/docker-compose.yml b/sqlserver/docker-compose.yml
@@ -6,6 +6,7 @@ services:
         links:
           - sqlserver
         environment:
+            RUNDECK_GRAILS_URL: http://localhost:4440
             RUNDECK_DATABASE_DRIVER: com.microsoft.sqlserver.jdbc.SQLServerDriver
             RUNDECK_DATABASE_USERNAME: sa
             RUNDECK_DATABASE_PASSWORD: RundeckPassw0rd
@@ -15,11 +16,15 @@ services:
           - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key
         ports:
           - 4440:4440
+        depends_on:
+          - sqlserver
     sqlserver:
         build:
           context: ./sqlserver
         expose:
           - 1433
+        ports:
+          - 1433:1433
         environment:
           - ACCEPT_EULA=Y
           - MSSQL_PID=Express

diff --git a/sqlserver/sqlserver/Dockerfile b/sqlserver/sqlserver/Dockerfile
@@ -1,5 +1,6 @@
-FROM microsoft/mssql-server-linux
+FROM mcr.microsoft.com/mssql/server
 
+USER root
 # Create app directory
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -10,4 +11,5 @@ COPY . /usr/src/app
 # Grant permissions for the import-data script to be executable
 RUN chmod +x /usr/src/app/import-data.sh
 
+USER mssql
 CMD /bin/bash ./entrypoint.sh