From b56f3a32b5e5b248d9406031f839b7504b8929d5 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Thu, 22 May 2025 10:17:52 -0700 Subject: [PATCH 1/6] update to use !override in docker-compose.ci.yml --- docker-compose.ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 019ccd9..900ee37 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -4,7 +4,7 @@ services: app: build: !reset image: ${DOCKER_APP_IMAGE} - volumes: !reset + volumes: !override volumes: - artifacts:/opt/app/artifacts From bbe1e3edbccfe28bc5a54db7a1a05899df97b4c8 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Thu, 22 May 2025 10:29:00 -0700 Subject: [PATCH 2/6] revert previous commit --- docker-compose.ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 900ee37..019ccd9 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -4,7 +4,7 @@ services: app: build: !reset image: ${DOCKER_APP_IMAGE} - volumes: !override + volumes: !reset volumes: - artifacts:/opt/app/artifacts From 18bc9439650306e815e9cdf43798c6a9ecb6a4dd Mon Sep 17 00:00:00 2001 From: zhouyu Date: Thu, 22 May 2025 10:40:40 -0700 Subject: [PATCH 3/6] try !override again --- docker-compose.ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 019ccd9..900ee37 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -4,7 +4,7 @@ services: app: build: !reset image: ${DOCKER_APP_IMAGE} - volumes: !reset + volumes: !override volumes: - artifacts:/opt/app/artifacts From dcd0bbf6a5d9006360c557d35fa920d3c7714f59 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Thu, 22 May 2025 13:03:56 -0700 Subject: [PATCH 4/6] remove word volumes --- docker-compose.ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 900ee37..13c3b49 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -5,12 +5,11 @@ services: build: !reset image: ${DOCKER_APP_IMAGE} volumes: !override - volumes: - artifacts:/opt/app/artifacts geoserver: !reset geoserver-secure: !reset - + volumes: artifacts: From 63257d4d5e8debd5438c9decb9b931b63af86461 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Thu, 22 May 2025 13:09:12 -0700 Subject: [PATCH 5/6] remove word volumes, keep !reset --- docker-compose.ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 13c3b49..2de02df 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -4,12 +4,12 @@ services: app: build: !reset image: ${DOCKER_APP_IMAGE} - volumes: !override + volumes: !reset - artifacts:/opt/app/artifacts geoserver: !reset geoserver-secure: !reset - + volumes: artifacts: From 8067504fbf050608c9d1735eb6e3f315bead5b19 Mon Sep 17 00:00:00 2001 From: zhouyu Date: Thu, 22 May 2025 13:17:10 -0700 Subject: [PATCH 6/6] remove word volumes, update to !override --- docker-compose.ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 2de02df..60c031c 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -4,7 +4,7 @@ services: app: build: !reset image: ${DOCKER_APP_IMAGE} - volumes: !reset + volumes: !override - artifacts:/opt/app/artifacts geoserver: !reset