Merge pull request #100 from merbla/docker-update

Update Docker Images - Splunk & .Net Core

Author: merbla

.gitignore

@@ -237,4 +237,6 @@ _Pvt_Extensions
 
 .vscode/
 
-sample/Sample/out/
+sample/Sample/out/
+
+.DS_Store

Dockerfile

@@ -1,10 +1,10 @@
-FROM microsoft/dotnet:2.0-sdk AS build
+FROM microsoft/dotnet:2.1-sdk AS build
 ADD . / 
 WORKDIR /sample/Sample
 RUN dotnet restore
 RUN dotnet publish -c Release -o out -f netcoreapp2.0
 
-FROM microsoft/dotnet:2.0-runtime AS runtime
+FROM microsoft/dotnet:2.1-runtime AS runtime
 WORKDIR /sample/Sample
 COPY --from=build /sample/Sample/out ./
 ENTRYPOINT ["dotnet", "Sample.dll"]

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - 8088:8088
       - 8089:8089
     environment:
-      SPLUNK_START_ARGS: "--accept-license --answer-yes"
+      SPLUNK_START_ARGS: "--accept-license --answer-yes --seed-passwd changeme"
       SPLUNK_USER: "root"
   sampleconsoleapp:
     depends_on:

run_sample.sh

@@ -1,6 +1,2 @@
 #!/bin/bash
-sh build.sh
-
-cd sample/Sample
-dotnet run 15 -f netcoreapp2.0
-cd ..
+docker-compose up --build

sample/splunk/Dockerfile

@@ -1,2 +1,2 @@
-FROM splunk/splunk:6.5.3
+FROM splunk/splunk:7.1.0
 ADD etc ${SPLUNK_HOME}/etc