Skip to content

Commit a89de2f

Browse files
committed
[FIX] Docker tests suite does not contain all logs
Missing volume creation after cleanup led to missing logs in build artifacts from Docker container run for modified container.
1 parent 2b848a7 commit a89de2f

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

Build/Test/cibuild_docker.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ isPathOwnedBySolr ()
160160
return $status
161161
}
162162

163-
run_container ()
163+
create_clean_local_volume ()
164164
{
165165
echo -n "Creating testvolume"
166166
prettyPrintOrExitOnError $? "$(mkdir -p "$LOCAL_VOLUME_PATH" 2>&1)"
@@ -173,8 +173,13 @@ run_container ()
173173

174174
echo -n "Create named volume inside of ~/solrcivolume"
175175
prettyPrintOrExitOnError $? "$(docker volume create --name "$LOCAL_VOLUME_NAME" --opt type=none --opt device="$LOCAL_VOLUME_PATH" --opt o=bind 2>&1)"
176+
}
177+
178+
run_container ()
179+
{
180+
create_clean_local_volume
176181

177-
echo -n "Starting container"
182+
echo -n "Starting standard container"
178183
prettyPrintOrExitOnError $? "$(docker run --name="$LOCAL_CONTAINER_NAME" -d -p 127.0.0.1:8998:8983 -v "$LOCAL_VOLUME_NAME":"$DEFAULT_IMAGE_VOLUME_EXPORT_PATH" "$LOCAL_IMAGE_NAME" 2>&1)"
179184
}
180185

@@ -349,7 +354,9 @@ assertCoresAreSwitchableViaEnvVar ()
349354
echo -e "\n${LIGHT_CYAN}Check the cores are disabled except desired by \$TYPO3_SOLR_ENABLED_CORES env:${NC}"
350355
cleanUp
351356

352-
echo -n "Starting container"
357+
create_clean_local_volume
358+
359+
echo -n "Starting custom container: with --env TYPO3_SOLR_ENABLED_CORES='german english danish'"
353360
prettyPrintOrExitOnError $? "$(docker run --env TYPO3_SOLR_ENABLED_CORES='german english danish' --name="$LOCAL_CONTAINER_NAME" -d -p 127.0.0.1:8998:8983 -v "$LOCAL_VOLUME_NAME":"$DEFAULT_IMAGE_VOLUME_EXPORT_PATH" "$LOCAL_IMAGE_NAME" 2>&1)"
354361

355362
ENABLED_CORES=(

0 commit comments

Comments
 (0)