From 3e5c96443aab591e8ad96bb3afb58d3e1ed6267f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:18:11 -0700 Subject: [PATCH] Style: Upcase "as" in Dockerfile (backport #214) (#217) * Fix case on "as" in Dockerfile (#214) Co-authored-by: Aaron Marburg (cherry picked from commit 8bbb19e38e5ccb929ded96512d100877389cde66) # Conflicts: # .docker/Dockerfile * Resolved merge conflicts * Bump build versions --------- Co-authored-by: Aaron Marburg Co-authored-by: Evan Palmer --- .docker/Dockerfile | 8 ++++---- .github/workflows/ci.yaml | 2 +- .github/workflows/docker.yaml | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 0112cad9..fe30b39a 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,5 +1,5 @@ ARG ROS_DISTRO=iron -FROM ros:$ROS_DISTRO-ros-base as ci +FROM ros:$ROS_DISTRO-ros-base AS ci ENV DEBIAN_FRONTEND=noninteractive @@ -36,7 +36,7 @@ RUN apt-get -q update \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* -FROM ci as robot +FROM ci AS robot # Configure a new non-root user ARG USERNAME=blue @@ -99,7 +99,7 @@ RUN sudo apt-get -q update \ RUN echo "source ${USER_WORKSPACE}/install/setup.bash" >> /home/$USERNAME/.bashrc \ && echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/$USERNAME/.bashrc -FROM robot as desktop +FROM robot AS desktop ENV DEBIAN_FRONTEND=noninteractive ENV GZ_VERSION=garden @@ -177,7 +177,7 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \ # Setup the simulation environment variables RUN echo "source ${USER_WORKSPACE}/src/blue/.docker/entrypoints/sim.sh" >> /home/$USERNAME/.bashrc -FROM desktop as desktop-nvidia +FROM desktop AS desktop-nvidia # Install NVIDIA software RUN sudo apt-get update \ diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 693ac20d..33ffca7f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,7 @@ jobs: submodules: recursive - name: Log into registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 5230aea7..92a44e85 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -33,7 +33,7 @@ jobs: - name: Log into registry if: env.PUSH == 'true' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -49,7 +49,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image - uses: docker/build-push-action@v6.2.0 + uses: docker/build-push-action@v6.5.0 with: context: . file: .docker/Dockerfile @@ -73,14 +73,14 @@ jobs: uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Log into registry if: env.PUSH == 'true' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -96,7 +96,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image - uses: docker/build-push-action@v6.2.0 + uses: docker/build-push-action@v6.5.0 with: context: . file: .docker/Dockerfile @@ -122,7 +122,7 @@ jobs: - name: Log into registry if: env.PUSH == 'true' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -138,7 +138,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image - uses: docker/build-push-action@v6.2.0 + uses: docker/build-push-action@v6.5.0 with: context: . file: .docker/Dockerfile @@ -163,7 +163,7 @@ jobs: - name: Log into registry if: env.PUSH == 'true' - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -179,7 +179,7 @@ jobs: type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }} - name: Build and push Docker image - uses: docker/build-push-action@v6.2.0 + uses: docker/build-push-action@v6.5.0 with: context: . file: .docker/Dockerfile