From 77892dc7d6b98b2bd94305e47db059cb51636b72 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 17 Apr 2023 13:32:29 +0100 Subject: [PATCH] ENGDOCS-1302 (#17123) --- _config.yml | 3 +++ _data/toc.yaml | 2 ++ compose/compose-file/13-merge.md | 7 +++++++ 3 files changed, 12 insertions(+) create mode 100644 compose/compose-file/13-merge.md diff --git a/_config.yml b/_config.yml index cbbd0472bc..95c40ca3e7 100644 --- a/_config.yml +++ b/_config.yml @@ -256,6 +256,9 @@ fetch-remote: - dest: "compose/compose-file/12-interpolation.md" src: - "12-interpolation.md" + - dest: "compose/compose-file/13-merge.md" + src: + - "13-merge.md" - dest: "compose/compose-file/build.md" src: - "build.md" diff --git a/_data/toc.yaml b/_data/toc.yaml index f81ad7c59b..d62912135f 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -932,6 +932,8 @@ reference: title: Extensions - path: /compose/compose-file/12-interpolation/ title: Interpolation + - path: /compose/compose-file/13-merge/ + title: Merge - path: /compose/compose-file/build/ title: Compose file build - path: /compose/compose-file/deploy/ diff --git a/compose/compose-file/13-merge.md b/compose/compose-file/13-merge.md new file mode 100644 index 0000000000..8b9f5f158d --- /dev/null +++ b/compose/compose-file/13-merge.md @@ -0,0 +1,7 @@ +--- +title: Merge and override +keywords: compose, compose specification +fetch_remote: + line_start: 2 + line_end: -1 +---