diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-10-16 01:04:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 01:04:06 +0200 |
| commit | ca946e7e2721cf62122e979d30f175c84a9dad48 (patch) | |
| tree | b78a483e6afc014e7d722611e8c311eae5b4d0a8 | |
| parent | f07709cbb68e3936aa6bf730dbd6f2f10cf83628 (diff) | |
| parent | 9dd158b70de7d6c962d58d06268125932cab5075 (diff) | |
| download | nextcloud-server-ca946e7e2721cf62122e979d30f175c84a9dad48.tar.gz nextcloud-server-ca946e7e2721cf62122e979d30f175c84a9dad48.zip | |
Merge pull request #40068 from nextcloud/devcontainer-fix-git-config
[Devcontainer] move git setup to postStartCommand
| -rw-r--r-- | .devcontainer/devcontainer.json | 1 | ||||
| -rwxr-xr-x | .devcontainer/postStart.sh | 5 | ||||
| -rwxr-xr-x | .devcontainer/setup.sh | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3fb1bf42e44..612b99fdcdd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,6 +3,7 @@ "dockerComposeFile": "docker-compose.yml", "service": "nextclouddev", "postCreateCommand": ".devcontainer/setup.sh", + "postStartCommand": ".devcontainer/postStart.sh", "forwardPorts": [ 80, 8080, diff --git a/.devcontainer/postStart.sh b/.devcontainer/postStart.sh new file mode 100755 index 00000000000..20657a15a94 --- /dev/null +++ b/.devcontainer/postStart.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Set git safe.directory +git config --global --add safe.directory /var/www/html +git config --global --add safe.directory /var/www/html/3rdparty
\ No newline at end of file diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index 3485d4f7257..11bee7175b7 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -3,10 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )" cd $DIR/ -# Set git safe.directory -git config --global --add safe.directory /var/www/html -git config --global --add safe.directory /var/www/html/3rdparty - git submodule update --init # Codespace config |