Skip to content

Style: Upcase "as" in Dockerfile (backport #214) #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 26, 2024
Merged

Style: Upcase "as" in Dockerfile (backport #214) #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adffaf0
Fix case on "as" in Dockerfile (#214)
amarburg Jul 26, 2024
1044c3e
Merge remote-tracking branch 'origin/iron' into mergify/bp/iron/pr-214
evan-palmer Jul 26, 2024
e488bbd
Resolved merge conflicts
evan-palmer Jul 26, 2024
1bb3454
Bump build versions
evan-palmer Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand Down