Merge pull request #115 from duplocloud/DUPLO-26299-2-build-issue

DUPLO-26299 Build fix

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
   - Issue with wait breaking when a pod didn't have the `Name` key
   - Jobs were not failing gracefully when waiting for completion but faults were present for pods on the job
+  - Removed potential cyclic dependencies in `docker-compose.yaml` by explicitly defining inherited sections
 
 ## [0.2.38] - 2024-10-28
 

docker-compose.yaml

@@ -1,38 +1,41 @@
 services:
 
-  duploctl: &base
-    image: &image duplocloud/duploctl:latest
-    build: 
+  duploctl:
+    image: duplocloud/duploctl:latest
+    container_name: duploctl
+    build:
       target: runner
-      args: &args
+      args:
         PY_VERSION: ${PY_VERSION:-3.12}
       tags:
-      - *image
+      - duplocloud/duploctl:latest
       - duplocloud/duploctl:${GIT_SHA:-latest}
       - duplocloud/duploctl:${GIT_REF:-latest}
       - duplocloud/duploctl:${GIT_TAG:-latest}
-      x-bake: 
-        platforms: &platforms
+      x-bake:
+        platforms:
         - linux/amd64
         - linux/arm64
         cache-to: type=gha,scope=runner,mode=max
         cache-from: type=gha,scope=runner
-    container_name: duploctl
-    environment: &environment
+    environment:
       DUPLO_HOST: ${DUPLO_HOST:-}
       DUPLO_TOKEN: ${DUPLO_TOKEN:-}
       DUPLO_TENANT: ${DUPLO_TENANT:-}
       DUPLO_OUTPUT: yaml
 
   duploctl-bin:
-    <<: *base
-    container_name: duploctl-bin
     image: duplocloud/duploctl:bin
+    container_name: duploctl-bin
     build:
       target: bin
-      args: *args
+      args:
+        PY_VERSION: ${PY_VERSION:-3.12}
       x-bake:
-        platforms: *platforms
+        platforms:
+        - linux/amd64
+        - linux/arm64
         output: type=local,dest=./dist
         cache-to: type=gha,scope=installer,mode=max
         cache-from: type=gha,scope=installer
+