Skip to content

Commit 08afde3

Browse files
authored
Merge pull request #48 from UCEAP/fix-dotfiles-cwd-and-php-8.4
Fix dotfiles install (#45) and upgrade to PHP 8.4
2 parents 49cb69a + a948fdb commit 08afde3

4 files changed

Lines changed: 14 additions & 1 deletion

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/php:8.3
1+
FROM mcr.microsoft.com/devcontainers/php:8.4
22

33
# Change default umask and add user to web group so we can share write permission on web files
44
# Configure pam_umask to set umask to 002 (works regardless of /etc/login.defs content)

local/etc/uceap.d/devcontainer_on_create.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
function devcontainer_on_create() {
2+
_cwd_workspace
3+
24
# Change default umask and add user to web group so we can share write permission on web files
35
sed -i 's/^#umask\s*022/umask 002/' ~/.profile
46
echo "umask 002" >>~/.zshrc
@@ -91,6 +93,9 @@ function devcontainer_on_create() {
9193
if [ -x .devcontainer/onCreate.sh ]; then
9294
.devcontainer/onCreate.sh
9395
fi
96+
97+
# Leave the shellServer with a valid cwd for any subsequent step (see issue #45)
98+
cd "$WORKSPACE_FOLDER"
9499
}
95100

96101
_devcontainer_on_create_desc='runs when the devcontainer is created'

local/etc/uceap.d/devcontainer_post_create.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
function devcontainer_post_create() {
2+
_cwd_workspace
3+
24
# set global ServerName so that apachectl isn't chatty
35
if [[ -n "$CODESPACE_NAME" ]]; then
46
SERVER_NAME="$CODESPACE_NAME-8080.app.github.dev"
@@ -27,6 +29,9 @@ function devcontainer_post_create() {
2729
if [ -x .devcontainer/postCreate.sh ]; then
2830
.devcontainer/postCreate.sh
2931
fi
32+
33+
# Leave the shellServer with a valid cwd for any subsequent step (see issue #45)
34+
cd "$WORKSPACE_FOLDER"
3035
}
3136

3237
_devcontainer_post_create_desc='runs after the devcontainer is created'

local/etc/uceap.d/devcontainer_update_content.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ function devcontainer_update_content() {
1414
if [ -x .devcontainer/updateContent.sh ]; then
1515
.devcontainer/updateContent.sh
1616
fi
17+
18+
# Leave the shellServer with a valid cwd for any subsequent step (see issue #45)
19+
cd "$WORKSPACE_FOLDER"
1720
}
1821

1922
_devcontainer_update_content_desc='runs when devcontainer content needs updating'

0 commit comments

Comments
 (0)