From 09467e94fe5db0dbb0176e86b36ea808fcebc6ba Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Tue, 24 May 2022 18:29:27 -0700 Subject: [PATCH] Update sqlserver example --- sqlserver/.env.dist | 2 +- sqlserver/docker-compose.yml | 5 +++++ sqlserver/sqlserver/Dockerfile | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sqlserver/.env.dist b/sqlserver/.env.dist index eaf8b32..b7477b3 100644 --- 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= \ No newline at end of file diff --git a/sqlserver/docker-compose.yml b/sqlserver/docker-compose.yml index 4297626..63e5984 100644 --- 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 index 7f75760..0b2e81d 100644 --- 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 \ No newline at end of file