Support additional_contexts

Signed-off-by: Otto Liljalaakso <[email protected]>

podman_compose.py

@@ -1261,6 +1261,12 @@ def normalize_service(service, sub_dir=""):
  if not context:
  context = "."
  service["build"]["context"] = context
+ if "build" in service and "additional_contexts" in service["build"]:
+ if is_dict(build["additional_contexts"]):
+ new_additional_contexts = []
+ for k, v in build["additional_contexts"].items():
+ new_additional_contexts.append(f"{k}={v}")
+ build["additional_contexts"] = new_additional_contexts
  for key in ("command", "entrypoint"):
  if key in service:
  if is_str(service[key]):
@@ -2126,6 +2132,8 @@ def build_one(compose, args, cnt):
  build_args.extend(get_secret_args(compose, cnt, secret))
  for tag in build_desc.get("tags", []):
  build_args.extend(["-t", tag])
+ for additional_ctx in build_desc.get("additional_contexts", {}):
+ build_args.extend([f"--build-context={additional_ctx}"])
  if "target" in build_desc:
  build_args.extend(["--target", build_desc["target"]])
  container_to_ulimit_args(cnt, build_args)

tests/additional_contexts/README.md

@@ -0,0 +1,14 @@
+# Test podman-compose with build.additional_contexts
+
+```
+podman-compose build
+podman-compose up
+podman-compose down
+```
+
+expected output would be
+
+```
+[dict] | Data for dict
+[list] | Data for list
+```

tests/additional_contexts/data_for_dict/data.txt

@@ -0,0 +1 @@
+Data for dict

tests/additional_contexts/data_for_list/data.txt

@@ -0,0 +1 @@
+Data for list

tests/additional_contexts/project/Dockerfile

@@ -0,0 +1,3 @@
+FROM busybox
+COPY --from=data data.txt /data/data.txt
+CMD ["busybox", "cat", "/data/data.txt"]

tests/additional_contexts/project/docker-compose.yml

@@ -0,0 +1,12 @@
+version: "3.7"
+services:
+ dict:
+ build:
+ context: .
+ additional_contexts:
+ data: ../data_for_dict
+ list:
+ build:
+ context: .
+ additional_contexts:
+ - data=../data_for_list