From 7ac9ee77a2a3e67aa58ba7ca438e0b190a9abfae Mon Sep 17 00:00:00 2001
From: Ariel Barreiro <abarrei@gmail.com>
Date: Sun, 1 Oct 2023 11:06:28 -0300
Subject: [PATCH] add HostWorkingDir, improve package and env handling (#1)

* Several small improvements

* Small typo

* sort files

---------

Co-authored-by: Thomas Hauschild <7961978+Morgy93@users.noreply.github.com>
---
 commands/web/gum                                      | 1 +
 config.gum.yaml                                       | 4 ++++
 install.yaml                                          | 5 +++--
 tests/test.bats                                       | 4 ++--
 web-build/{Dockerfile.ddev-gum => pre.Dockerfile.gum} | 3 ---
 5 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 config.gum.yaml
 rename web-build/{Dockerfile.ddev-gum => pre.Dockerfile.gum} (52%)

diff --git a/commands/web/gum b/commands/web/gum
index fabde4d..84afe38 100644
--- a/commands/web/gum
+++ b/commands/web/gum
@@ -5,5 +5,6 @@
 ## Usage: gum
 ## Example: "ddev gum"
 ## ExecRaw: true
+## HostWorkingDir: true
 
 gum "$@"
diff --git a/config.gum.yaml b/config.gum.yaml
new file mode 100644
index 0000000..e5c7dcc
--- /dev/null
+++ b/config.gum.yaml
@@ -0,0 +1,4 @@
+#ddev-generated
+webimage_extra_packages: [gum]
+web_environment:
+  - COLORTERM=${COLORTERM}
diff --git a/install.yaml b/install.yaml
index 88ba6a2..c007885 100644
--- a/install.yaml
+++ b/install.yaml
@@ -1,5 +1,6 @@
-name: ddev-gum
+name: gum
 
 project_files:
 - commands/web/gum
-- web-build/Dockerfile.ddev-gum
+- config.gum.yaml
+- web-build/pre.Dockerfile.gum
diff --git a/tests/test.bats b/tests/test.bats
index da424fe..38b72f1 100644
--- a/tests/test.bats
+++ b/tests/test.bats
@@ -1,9 +1,9 @@
 setup() {
   set -eu -o pipefail
   export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.."
-  export TESTDIR=~/tmp/ddev-gum
+  export TESTDIR=~/tmp/test-gum
   mkdir -p $TESTDIR
-  export PROJNAME=ddev-gum
+  export PROJNAME=test-gum
   export DDEV_ADDON=Morgy93/ddev-gum
   export DDEV_NON_INTERACTIVE=true
   ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
diff --git a/web-build/Dockerfile.ddev-gum b/web-build/pre.Dockerfile.gum
similarity index 52%
rename from web-build/Dockerfile.ddev-gum
rename to web-build/pre.Dockerfile.gum
index 8b89398..390b8b8 100644
--- a/web-build/Dockerfile.ddev-gum
+++ b/web-build/pre.Dockerfile.gum
@@ -3,6 +3,3 @@
 RUN mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://repo.charm.sh/apt/gpg.key | gpg --dearmor -o /etc/apt/keyrings/charm.gpg
 RUN echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | tee /etc/apt/sources.list.d/charm.list
-# https://ddev.readthedocs.io/en/stable/users/extend/customizing-images/#build-time-environment-variables
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confnew" --no-install-recommends --no-install-suggests gum
-ENV COLORTERM=truecolor
\ No newline at end of file