From c7a970dadfdf4a6c2c048c02cc35e80cb0f9347e Mon Sep 17 00:00:00 2001 From: Bradley Bickford Date: Thu, 5 Dec 2024 20:40:11 -0500 Subject: [PATCH] Various fixes for the ubuntu images --- Dockerfile.pwsh.ubuntu | 2 ++ Dockerfile.ubuntu | 1 + 2 files changed, 3 insertions(+) diff --git a/Dockerfile.pwsh.ubuntu b/Dockerfile.pwsh.ubuntu index 08c3cb2..47d169d 100644 --- a/Dockerfile.pwsh.ubuntu +++ b/Dockerfile.pwsh.ubuntu @@ -49,6 +49,8 @@ RUN chown 750 /usr/bin/entrypoint.sh \ && GRADLEFOLDER="/home/ubuntu/gradle-$(echo \"$GRADLEZIP\" | cut -d '-' -f 2)" \ && unzip /home/ubuntu/wpilib/$ARTIFACTSYEAR/installUtils/$GRADLEZIP -d /home/ubuntu/ \ && chown -R ubuntu:ubuntu $GRADLEFOLDER \ + && mkdir -p /home/ubuntu/.config/powershell \ + && chown -R ubuntu:ubuntu /home/ubuntu/.config \ && echo "\$JAVA_HOME=/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ && echo "\$env:PATH+=:/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk/bin" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ && echo "\$env:PATH+=:$GRADLEFOLDER/bin" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 74fc86f..6fc4483 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -21,6 +21,7 @@ COPY code-server.tar.gz /tmp COPY settings.json /tmp COPY config.yaml /tmp COPY project-creator.py /tmp +COPY entrypoint.sh /usr/bin ARG WPILIB_DL_URL ARG WPILIB_FILE_NAME=wpilib.tar.gz