Fix CI Image Permissions for Non-Root Users (#969)

* Use shared directory for pyenv

* Simplify permissions

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

.devcontainer/Dockerfile

@@ -5,18 +5,16 @@ FROM ghcr.io/newrelic/newrelic-python-agent-ci:${IMAGE_TAG}
 # Setup non-root user
 USER root
 ARG UID=1000
-ARG GID=$UID
+ARG GID=${UID}
 ENV HOME /home/vscode
 RUN mkdir -p ${HOME} && \
     groupadd --gid ${GID} vscode && \
     useradd --uid ${UID} --gid ${GID} --home ${HOME} vscode && \
     chown -R ${UID}:${GID} /home/vscode
 
-# Move pyenv installation
-ENV PYENV_ROOT="${HOME}/.pyenv"
-ENV PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:${PATH}"
-RUN mv /root/.pyenv /home/vscode/.pyenv && \
-    chown -R vscode:vscode /home/vscode/.pyenv
+# Fix pyenv installation
+RUN echo 'eval "$(pyenv init -)"' >>${HOME}/.bashrc && \
+    chown -R vscode:vscode ${PYENV_ROOT}
 
 # Set user
 USER ${UID}:${GID}

.github/containers/Dockerfile

@@ -89,10 +89,10 @@ ENV HOME /root
 WORKDIR "${HOME}"
 
 # Install pyenv
-ENV PYENV_ROOT="${HOME}/.pyenv"
+ENV PYENV_ROOT="/usr/local/pyenv"
 RUN curl https://pyenv.run/ | /bin/bash
-ENV PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:${PATH}"
-RUN echo 'eval "$(pyenv init -)"' >>$HOME/.bashrc && \
+ENV PATH="${PYENV_ROOT}/bin:${PYENV_ROOT}/shims:${PATH}"
+RUN echo 'eval "$(pyenv init -)"' >>${HOME}/.bashrc && \
     pyenv update
 
 # Install Python