diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-23 19:30:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 19:30:07 +0200 |
| commit | 6ff15012870792480f0b31fb57a534edabaa4f00 (patch) | |
| tree | 9e3e3d0afcdc8ebb111f2d3b30194d403882aa74 | |
| parent | 1aac197f79e91b06ec7e948bd73bb2464e8a508f (diff) | |
| parent | 81115243ef69368a22ca78f0c4cd5dfc173b505d (diff) | |
| download | podman-6ff15012870792480f0b31fb57a534edabaa4f00.tar.gz podman-6ff15012870792480f0b31fb57a534edabaa4f00.tar.bz2 podman-6ff15012870792480f0b31fb57a534edabaa4f00.zip | |
Merge pull request #7064 from edsantiago/fix_rootless_perms
CI: fix rootless permission error
| -rw-r--r-- | contrib/cirrus/lib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 2375d512e..91eeb7a7f 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -299,13 +299,13 @@ is_release() { } setup_rootless() { - req_env_var ROOTLESS_USER GOSRC SECRET_ENV_RE ROOTLESS_ENV_RE + req_env_var ROOTLESS_USER GOPATH GOSRC SECRET_ENV_RE ROOTLESS_ENV_RE # Only do this once if passwd --status $ROOTLESS_USER then echo "Updating $ROOTLESS_USER user permissions on possibly changed libpod code" - chown -R $ROOTLESS_USER:$ROOTLESS_USER "$GOSRC" + chown -R $ROOTLESS_USER:$ROOTLESS_USER "$GOPATH" "$GOSRC" return 0 fi @@ -316,7 +316,7 @@ setup_rootless() { echo "creating $ROOTLESS_UID:$ROOTLESS_GID $ROOTLESS_USER user" groupadd -g $ROOTLESS_GID $ROOTLESS_USER useradd -g $ROOTLESS_GID -u $ROOTLESS_UID --no-user-group --create-home $ROOTLESS_USER - chown -R $ROOTLESS_USER:$ROOTLESS_USER "$GOSRC" + chown -R $ROOTLESS_USER:$ROOTLESS_USER "$GOPATH" "$GOSRC" echo "creating ssh keypair for $USER" [[ -r "$HOME/.ssh/id_rsa" ]] || \ |