Moving some things around to not break any of the existing process that relies on bash when setting up the Powershell images

This commit is contained in:
Bradley Bickford 2024-12-05 20:18:06 -05:00
parent 55143adcf6
commit 53a5525de4
2 changed files with 5 additions and 3 deletions

View File

@ -23,7 +23,7 @@ RUN curl -sSL https://packages.microsoft.com/config/rhel/9/packages-microsoft-pr
&& dnf install powershell -y \
&& rm -rf /var/cache/dnf
RUN useradd -u 1000 coder -s /usr/bin/pwsh
RUN useradd -u 1000 coder
COPY code-server.tar.gz /tmp
COPY settings.json /tmp
@ -68,6 +68,8 @@ RUN chown 750 /usr/bin/entrypoint.sh \
&& su -c "cp -f /tmp/project-creator.py /home/coder" "coder" \
&& for EXTENSION in /home/coder/wpilib/$ARTIFACTSYEAR/vsCodeExtensions/*.vsix; do su -c "code-server --install-extension $EXTENSION" "coder"; done
RUN usermod -s /usr/bin/pwsh coder
EXPOSE 8080
USER coder

View File

@ -33,8 +33,6 @@ COPY config.yaml /tmp
COPY project-creator.py /tmp
COPY entrypoint.sh /usr/bin
RUN usermod -s /usr/bin/pwsh ubuntu
ARG WPILIB_DL_URL
ARG WPILIB_FILE_NAME=wpilib.tar.gz
@ -70,6 +68,8 @@ RUN chown 750 /usr/bin/entrypoint.sh \
&& su -c "cp -f /tmp/project-creator.py /home/ubuntu" "ubuntu" \
&& for EXTENSION in /home/ubuntu/wpilib/$ARTIFACTSYEAR/vsCodeExtensions/*.vsix; do su -c "code-server --install-extension $EXTENSION" "ubuntu"; done
RUN usermod -s /usr/bin/pwsh ubuntu
EXPOSE 8080
USER ubuntu