From 05c11b4a6b4bcf4bfd1ad7017c27b341c2356a72 Mon Sep 17 00:00:00 2001
From: Daniel Krippner <daniel.krippner@etas.com>
Date: Wed, 4 Jun 2025 10:24:14 +0200
Subject: [PATCH 1/2] Minor update and improvement to devcontainer setup

---
 .devcontainer/Dockerfile        | 12 +++++-------
 .devcontainer/devcontainer.json |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e5556de..7a5463b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -29,13 +29,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 ARG OFT_CORE_VERSION=4.1.0
 ARG OFT_ASCIIDOC_PLUGIN_VERSION=0.3.0
 ENV LIB_DIR=/opt/oft/lib
-RUN <<EOF
-mkdir -p $LIB_DIR
-base_url=https://github.com/itsallcode
-wget -P $LIB_DIR ${base_url}/openfasttrace/releases/download/$OFT_CORE_VERSION/openfasttrace-$OFT_CORE_VERSION.jar
-wget -P $LIB_DIR ${base_url}/openfasttrace-asciidoc-plugin/releases/download/$OFT_ASCIIDOC_PLUGIN_VERSION/openfasttrace-asciidoc-plugin-$OFT_ASCIIDOC_PLUGIN_VERSION-with-dependencies.jar
-EOF
-RUN echo '#!/bin/bash\n\njava -cp "${LIB_DIR}/*" org.itsallcode.openfasttrace.core.cli.CliStarter "$@"' > /usr/local/bin/oft \
+RUN mkdir -p $LIB_DIR \
+    && base_url=https://github.com/itsallcode \
+    && wget -P $LIB_DIR ${base_url}/openfasttrace/releases/download/$OFT_CORE_VERSION/openfasttrace-$OFT_CORE_VERSION.jar \
+    && wget -P $LIB_DIR ${base_url}/openfasttrace-asciidoc-plugin/releases/download/$OFT_ASCIIDOC_PLUGIN_VERSION/openfasttrace-asciidoc-plugin-$OFT_ASCIIDOC_PLUGIN_VERSION-with-dependencies.jar \
+    && echo '#!/bin/bash\n\njava -cp "${LIB_DIR}/*" org.itsallcode.openfasttrace.core.cli.CliStarter "$@"' > /usr/local/bin/oft \
     && chmod +x /usr/local/bin/oft
 
 # Before installing cargo tools, change to the user that will be used in the container later.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 69d2166..db445db 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -41,7 +41,7 @@
                 "hediet.vscode-drawio",
                 "linusu.auto-dark-mode",
                 "mhutchie.git-graph",
-                "ms-azuretools.vscode-docker",
+                "ms-azuretools.vscode-containers",
                 "rust-lang.rust-analyzer",
                 "streetsidesoftware.code-spell-checker",
                 "tamasfe.even-better-toml",

From 9928787de6a89386578ee44d0226b228c9c08875 Mon Sep 17 00:00:00 2001
From: Daniel Krippner <daniel.krippner@etas.com>
Date: Wed, 4 Jun 2025 10:40:27 +0200
Subject: [PATCH 2/2] Remove duplicate/deprecated git graph extension

---
 .devcontainer/devcontainer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index db445db..5c5ace1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -40,7 +40,6 @@
                 "gxl.git-graph-3",
                 "hediet.vscode-drawio",
                 "linusu.auto-dark-mode",
-                "mhutchie.git-graph",
                 "ms-azuretools.vscode-containers",
                 "rust-lang.rust-analyzer",
                 "streetsidesoftware.code-spell-checker",