From 12dfb4f077894a4a574d8871efa4e0fa9a0654c1 Mon Sep 17 00:00:00 2001 From: Eli Byrd Date: Fri, 20 Oct 2023 01:47:29 -0500 Subject: [PATCH 1/2] Update compose.yml --- tools/action-runners/compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/action-runners/compose.yml b/tools/action-runners/compose.yml index 08016c1e..8e88ca4d 100644 --- a/tools/action-runners/compose.yml +++ b/tools/action-runners/compose.yml @@ -8,7 +8,7 @@ services: context: . dockerfile: Dockerfile_Jammy args: - RUNNER_VERSION: '2.309.0' + RUNNER_VERSION: '2.310.2' command: unix-connect:/var/run/docker.sock deploy: replicas: 5 @@ -32,7 +32,7 @@ services: context: . dockerfile: Dockerfile_JetPack args: - RUNNER_VERSION: '2.309.0' + RUNNER_VERSION: '2.310.2' command: unix-connect:/var/run/docker.sock deploy: replicas: 1 From fec750de9b4ca9d6f8a26720ddb7d01665967f1f Mon Sep 17 00:00:00 2001 From: Eli Byrd Date: Fri, 20 Oct 2023 01:52:24 -0500 Subject: [PATCH 2/2] Update Dockerfile for Action Runners --- tools/action-runners/Dockerfile_Jammy | 16 +++++++++------- tools/action-runners/Dockerfile_JetPack | 14 +++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tools/action-runners/Dockerfile_Jammy b/tools/action-runners/Dockerfile_Jammy index ac342450..7bff98e6 100644 --- a/tools/action-runners/Dockerfile_Jammy +++ b/tools/action-runners/Dockerfile_Jammy @@ -6,7 +6,7 @@ ARG UBUNTU_MAJOR="22" ARG CUDA_MAJOR="11" ARG CUDA_MINOR="7" ARG CUDA_PATCH="0" -ARG RUNNER_VERSION="2.309.0" +ARG RUNNER_VERSION="2.310.2" ENV DEBIAN_FRONTEND=noninteractive # Set Labels @@ -32,17 +32,19 @@ RUN cd /home/docker && mkdir actions-runner && cd actions-runner \ # install some additional dependencies RUN chown -R docker ~docker && /home/docker/actions-runner/bin/installdependencies.sh -# add over the start.sh script -COPY scripts/start.sh start.sh - -# make the script executable -RUN chmod +x start.sh - # Set Ownership of Autonomy Software RUN chown -R docker /opt/Autonomy_Software/ +RUN chown docker -R /usr/local/zed +RUN chown docker -R /usr/local/cuda # set the user to "docker" so all subsequent commands are run as the docker user USER docker +# add over the start.sh script +RUN wget https://raw.githubusercontent.com/MissouriMRDT/Autonomy_Software/development/tools/action-runners/scripts/start.sh start.sh + +# make the script executable +RUN chmod +x start.sh + # set the entrypoint to the start.sh script ENTRYPOINT ["./start.sh"] diff --git a/tools/action-runners/Dockerfile_JetPack b/tools/action-runners/Dockerfile_JetPack index 2369fb75..d9c83123 100644 --- a/tools/action-runners/Dockerfile_JetPack +++ b/tools/action-runners/Dockerfile_JetPack @@ -7,7 +7,7 @@ ARG L4T_MINOR="3" ARG L4T_PATCH="1" ARG L4T_BASE="l4t-jetpack" ARG CUDA_PATCH="0" -ARG RUNNER_VERSION="2.309.0" +ARG RUNNER_VERSION="2.310.2" ENV DEBIAN_FRONTEND=noninteractive # Set Labels @@ -33,12 +33,6 @@ RUN cd /home/docker && mkdir actions-runner && cd actions-runner \ # install some additional dependencies RUN chown -R docker ~docker && /home/docker/actions-runner/bin/installdependencies.sh -# add over the start.sh script -ADD scripts/start.sh start.sh - -# make the script executable -RUN chmod +x start.sh - RUN chown docker -R /opt/Autonomy_Software RUN chown docker -R /usr/local/zed RUN chown docker -R /usr/local/cuda @@ -46,5 +40,11 @@ RUN chown docker -R /usr/local/cuda # set the user to "docker" so all subsequent commands are run as the docker user USER docker +# add over the start.sh script +RUN wget https://raw.githubusercontent.com/MissouriMRDT/Autonomy_Software/development/tools/action-runners/scripts/start.sh start.sh + +# make the script executable +RUN chmod +x start.sh + # set the entrypoint to the start.sh script ENTRYPOINT ["./start.sh"]