Skip to content

Commit

Permalink
add HostWorkingDir, improve package and env handling (#1)
Browse files Browse the repository at this point in the history
* Several small improvements

* Small typo

* sort files

---------

Co-authored-by: Thomas Hauschild <[email protected]>
  • Loading branch information
hanoii and Morgy93 authored Oct 1, 2023
1 parent 65c6060 commit 7ac9ee7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions commands/web/gum
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
## Usage: gum
## Example: "ddev gum"
## ExecRaw: true
## HostWorkingDir: true

gum "$@"
4 changes: 4 additions & 0 deletions config.gum.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#ddev-generated
webimage_extra_packages: [gum]
web_environment:
- COLORTERM=${COLORTERM}
5 changes: 3 additions & 2 deletions install.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions tests/test.bats
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 7ac9ee7

Please sign in to comment.