Skip to content

Commit

Permalink
For 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
shinsenter committed Feb 21, 2023
1 parent 4abbde0 commit 42b9b16
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ jobs:
s6_version:
- v3.1.3.0
- v3.1.4.0
- v3.1.4.1
env:
DOCKER_BUILDKIT: "1"
steps:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Changelog


## 4.2.0 - 2023-02-21

- Allow the `www-data` user to run bash scripts.
- Use [S6 Overlay v3.1.4.1](https://github.com/just-containers/s6-overlay/releases/tag/v3.1.4.1).


## 4.1.0 - 2023-02-20

Use [S6 Overlay v3.1.4.0](https://github.com/just-containers/s6-overlay/releases/tag/v3.1.4.0).
Expand Down
3 changes: 2 additions & 1 deletion S6_VERSIONS
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
v3.1.3.0
v3.1.4.0
v3.1.4.0
v3.1.4.1
8 changes: 5 additions & 3 deletions src/base-ubuntu/root/etc/cont-init.d/000-update-webuser
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ if [ "$WEBUSER" != "www-data" ]; then
echo "🔥 Creating '${WEBUSER}' user."
useradd -r -g 9999 \
-G root,www-data --no-log-init \
-d /root -s /usr/bin/bash -u $PUID $WEBUSER
-d /root -s /bin/bash -u $PUID $WEBUSER
wmd /root -R
else
usermod -s /bin/bash $WEBUSER
fi

if [[ "$PUID" != "$(id -u $WEBUSER)" || "$PGID" != "$(id -g $WEBUSER)" ]]; then
echo "🔥 New PUID and PGID for $WEBHOME will be updated."
/usr/sbin/usermod -o -u $PUID $WEBUSER
/usr/sbin/groupmod -o -g $PGID $WEBGROUP
usermod -o -u $PUID $WEBUSER
groupmod -o -g $PGID $WEBGROUP
touch /tmp/owner-changed
fi

Expand Down

0 comments on commit 42b9b16

Please sign in to comment.