This is an automated email from the ASF dual-hosted git repository. msciabarra pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openserverless-devcontainer.git
commit 9f821b7799132293cdaf8f76d304132a47c0b21c Author: Michele Sciabarra <[email protected]> AuthorDate: Mon Nov 24 13:52:12 2025 +0000 fixed --- Dockerfile | 2 +- Taskfile.yml | 7 +++++++ start.sh | 9 +++++---- supervisord.ini | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 306c01d..f4bd808 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,12 +38,12 @@ RUN \ npm install -g npm RUN userdel node ; rm -Rvf /home/node +ENV HOME=/home ENV OPS_HOME=/home ENV OPS_BRANCH=main ENV PATH=/home/.local/bin:/usr/local/bin:/usr/bin:/bin RUN printf "OPS_HOME=$OPS_HOME\nOPS_BRANCH=$OPS_BRANCH\nPATH=$PATH\n" >/etc/environment RUN \ - export HOME=/home ;\ curl -sL https://raw.githubusercontent.com/apache/openserverless-cli/refs/heads/main/install.sh | bash ;\ ops -t ;\ git clone https://github.com/apache/openserverless-devcontainer $HOME/.ops/openserverless-devcontainer ;\ diff --git a/Taskfile.yml b/Taskfile.yml index c5b1a9d..9e89554 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -12,6 +12,13 @@ tasks: show: "echo {{.NAME}}:{{.TAG}}" + update: + silent: true + cmds: + - jq . ../olaris/opsroot.json >_opsroot.orig + - jq '.config.images.devcontainer = "{{.NAME}}:{{.TAG}}"' ../olaris/opsroot.json >_opsroot.json + - diff _opsroot.orig _opsroot.json || cp -v _opsroot.json ../olaris/opsroot.json + image-tag: - git tag -d "$(git tag)" || true - git tag "0.1.0-incubating.$(date +%y%m%d%H%M)" diff --git a/start.sh b/start.sh index 0743cc4..e162a31 100755 --- a/start.sh +++ b/start.sh @@ -5,21 +5,22 @@ mkdir -p /run/sshd ssh-keygen -A # update ops +export HOME=/home export OPS_HOME=/home ops -update # setup user workspace -export HOME=/home/workspace if test -z "$USERID" then USERID=1000 fi -/usr/sbin/useradd -u "$USERID" -d $HOME -o -U -s /bin/bash workspace +/usr/sbin/useradd -u "$USERID" -d $HOME -o -U -s /bin/bash devel # add ssh key if test -n "$SSHKEY" then mkdir -p $HOME/.ssh - if ! grep "$SSHKEY" $HOME/.ssh/authorized_keys + touch $HOME/.ssh/authorized_keys + if ! grep "$SSHKEY" $HOME/.ssh/authorized_keys >/dev/null then echo "$SSHKEY" >>$HOME/.ssh/authorized_keys fi chmod 600 $HOME/.ssh/authorized_keys @@ -27,8 +28,8 @@ then fi # fix permissions +chmod 0755 $HOME chown -Rf "$USERID" /home # start supervisor supervisord -c /etc/supervisord.ini - diff --git a/supervisord.ini b/supervisord.ini index 93ea277..dd5ab03 100644 --- a/supervisord.ini +++ b/supervisord.ini @@ -1,6 +1,6 @@ [supervisord] nodaemon=true -logfile=/dev/stdout +logfile=/dev/null logfile_maxbytes=0 pidfile=/tmp/supervisord.pid user=root
