Skip to content

Commit a6fd21c

Browse files
committed
Added remove orphans
1 parent 8408a47 commit a6fd21c

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
# and load assetstore from a cached copy
138138
- name: Start DSpace REST Backend via Docker (for e2e tests)
139139
run: |
140-
docker compose -f ./docker/docker-compose-ci.yml up -d
140+
docker compose -f ./docker/docker-compose-ci.yml up -d --remove-orphans
141141
docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
142142
docker container ls
143143
@@ -310,7 +310,7 @@ jobs:
310310
run: kill -9 $(lsof -t -i:4000)
311311

312312
- name: Shutdown Docker containers
313-
run: docker compose -f ./docker/docker-compose-ci.yml down
313+
run: docker compose -f ./docker/docker-compose-ci.yml down --remove-orphans
314314

315315
# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
316316
# # job above. This is necessary because Codecov uploads seem to randomly fail at times.

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
cd ../..
6868
# use customized docker-compose file for the `85` port because the server is exposed with the namespace `repository`
6969
# `/repository/server`
70-
docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose.yml up -d --no-build
70+
docker compose --env-file $ENVFILE -p dspace-$INSTANCE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose-rest.yml -f $CONFIG_PATH/docker-compose.yml up -d --no-build --remove-orphans
7171
7272
import-3:
7373
runs-on: dspace-${{inputs.DEV_MACHINE}}-dep-1

build-scripts/run/start.backend.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ IF "%ENVFILE%"=="" set ENVFILE=%cd%/envs/.default
22

33
pushd ..\..
44
docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/docker-compose-rest.yml pull dspace dspacesolr dspacedb
5-
docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/docker-compose-rest.yml up -d --force-recreate --no-build dspace dspacesolr dspacedb
5+
docker-compose --env-file %ENVFILE% -p dq-d7 -f docker/docker-compose-rest.yml up -d --force-recreate --no-build --remove-orphans dspace dspacesolr dspacedb
66
popd
77

88
IF "%1"=="nopause" GOTO No1

build-scripts/run/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ docker pull $DSPACE_UI_IMAGE
1717
pushd ../..
1818
echo "====="
1919
docker compose --env-file $ENVFILE -f docker/docker-compose.yml -f docker/docker-compose-rest.yml pull
20-
docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --no-build
20+
docker compose --env-file $ENVFILE -p $PROJECT -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --no-build --remove-orphans
2121
popd
2222

2323
# Create admin user

0 commit comments

Comments
 (0)