Skip to content

Commit 7ac9ee7

Browse files
hanoiiMorgy93
andauthored
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>
1 parent 65c6060 commit 7ac9ee7

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

commands/web/gum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
## Usage: gum
66
## Example: "ddev gum"
77
## ExecRaw: true
8+
## HostWorkingDir: true
89

910
gum "$@"

config.gum.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#ddev-generated
2+
webimage_extra_packages: [gum]
3+
web_environment:
4+
- COLORTERM=${COLORTERM}

install.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
name: ddev-gum
1+
name: gum
22

33
project_files:
44
- commands/web/gum
5-
- web-build/Dockerfile.ddev-gum
5+
- config.gum.yaml
6+
- web-build/pre.Dockerfile.gum

tests/test.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
setup() {
22
set -eu -o pipefail
33
export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.."
4-
export TESTDIR=~/tmp/ddev-gum
4+
export TESTDIR=~/tmp/test-gum
55
mkdir -p $TESTDIR
6-
export PROJNAME=ddev-gum
6+
export PROJNAME=test-gum
77
export DDEV_ADDON=Morgy93/ddev-gum
88
export DDEV_NON_INTERACTIVE=true
99
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true

web-build/Dockerfile.ddev-gum renamed to web-build/pre.Dockerfile.gum

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33
RUN mkdir -p /etc/apt/keyrings
44
RUN curl -fsSL https://repo.charm.sh/apt/gpg.key | gpg --dearmor -o /etc/apt/keyrings/charm.gpg
55
RUN echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | tee /etc/apt/sources.list.d/charm.list
6-
# https://ddev.readthedocs.io/en/stable/users/extend/customizing-images/#build-time-environment-variables
7-
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confnew" --no-install-recommends --no-install-suggests gum
8-
ENV COLORTERM=truecolor

0 commit comments

Comments
 (0)