From f41d67aa5c27743735632caa511b178726be17f3 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Fri, 3 Mar 2023 17:57:47 -0700 Subject: [PATCH] Switch devcontainer/github codespaces to use apt install (#4612) [skip ci] --- .../src/install-ddev/devcontainer-feature.json | 2 +- .github/devcontainers/src/install-ddev/install.sh | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/devcontainers/src/install-ddev/devcontainer-feature.json b/.github/devcontainers/src/install-ddev/devcontainer-feature.json index 34d85a858f8..f4be923e892 100644 --- a/.github/devcontainers/src/install-ddev/devcontainer-feature.json +++ b/.github/devcontainers/src/install-ddev/devcontainer-feature.json @@ -1,6 +1,6 @@ { "name": "Install DDEV for Codespaces", "id": "install-ddev", - "version": "0.2.0", + "version": "0.3.0", "description": "DDEV feature for Codespaces/devcontainers" } diff --git a/.github/devcontainers/src/install-ddev/install.sh b/.github/devcontainers/src/install-ddev/install.sh index aad0d6aea46..ef53b60bc9b 100644 --- a/.github/devcontainers/src/install-ddev/install.sh +++ b/.github/devcontainers/src/install-ddev/install.sh @@ -1,16 +1,7 @@ #!/bin/bash set -eu -o pipefail -sudo apt update >/dev/null && sudo apt install -y xdg-utils >/dev/null +curl -fsSL https://apt.fury.io/drud/gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ddev.gpg > /dev/null +echo "deb [signed-by=/etc/apt/trusted.gpg.d/ddev.gpg] https://apt.fury.io/drud/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list +sudo apt update >/dev/null && sudo apt install -y ddev xdg-utils >/dev/null -# This will eventually move to a simple apt install -sudo apt remove ddev >/dev/null 2>&1 || true -DDEV_URL=https://nightly.link/drud/ddev/workflows/master-build/master/ddev-linux-amd64.zip -echo "Installing DDEV" - -cd /tmp && curl -s -L -O ${DDEV_URL} -zipball=$(basename ${DDEV_URL}) -unzip ${zipball} -chmod +x ddev && sudo mv ddev /usr/local/bin - -rm -rf ${zipball} /tmp/tempproject