@@ -986,9 +986,8 @@ jobs:
986986 run : |
987987 echo "=== Starting Splunk ${{ matrix.splunk_version }} with no provision to test restoration==="
988988
989- if [ "${{ matrix.context_type }}" = "kvstore_disabled" ]; then
990- echo "Adding disable_kvstore app to docker run as context_type is disable_kvstore"
991- docker run -d \
989+ echo "default docker run (not mounting app directory as we will restore files so they should come back locally in the container"
990+ docker run -d \
992991 --name splunk \
993992 --hostname splunk \
994993 -p 8000:8000 \
@@ -998,31 +997,14 @@ jobs:
998997 -e SPLUNK_START_ARGS="--accept-license" \
999998 -e SPLUNK_PASSWORD="${{ env.SPLUNK_PASSWORD }}" \
1000999 -e TZ="Europe/Paris" \
1001- -v "$(pwd)/apppackage/splunkconf-backup:${SPLUNK_HOME}/etc/apps/splunkconf-backup/" \
1002- -v "$(pwd)/apppackage/disable_kvstore:${SPLUNK_HOME}/etc/apps/disable_kvstore/" \
10031000 "${DOCKER_IMAGE}" no-provision
1004- else
1005- echo "default docker run"
1006- docker run -d \
1007- --name splunk \
1008- --hostname splunk \
1009- -p 8000:8000 \
1010- -p 8089:8089 \
1011- -e ENABLE_TCP_MODE=true \
1012- -e SPLUNK_GENERAL_TERMS="--accept-sgt-current-at-splunk-com" \
1013- -e SPLUNK_START_ARGS="--accept-license" \
1014- -e SPLUNK_PASSWORD="${{ env.SPLUNK_PASSWORD }}" \
1015- -e TZ="Europe/Paris" \
1016- -v "$(pwd)/apppackage/splunkconf-backup:${SPLUNK_HOME}/etc/apps/splunkconf-backup/" \
1017- "${DOCKER_IMAGE}" no-provision
1018- fi
10191001
10201002 echo "Container started with Splunk in no-provision mode..."
10211003
10221004 # -------------------------------------------------------
10231005 # Step xx: Cleanup docker used for restore
10241006 # -------------------------------------------------------
1025- - name : Cleanup Splunk container
1007+ - name : Cleanup Splunk restoration container
10261008 if : always()
10271009 run : |
10281010 docker stop splunk 2>/dev/null || true
0 commit comments