diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a73a8a2d5e..5e6e317ee0 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -8,6 +8,7 @@ ARG BASE_BRANCH= ######################### Base Tutorial Image ################################################# + FROM ros:${ROS_DISTRO}-ros-base as base_image ENV ROS_UNDERLAY /root/ws_moveit/ WORKDIR $ROS_UNDERLAY diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml index 3949ab5da2..8406760a75 100644 --- a/.github/workflows/docker-base.yml +++ b/.github/workflows/docker-base.yml @@ -35,7 +35,6 @@ jobs: if: steps.changed-files.outputs.any_changed == 'true' uses: docker/setup-buildx-action@v2 - name: Login to Github Container Registry - if: steps.changed-files.outputs.any_changed == 'true' uses: docker/login-action@v2 with: registry: ghcr.io diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index f3e09351a4..e04920841e 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -27,7 +27,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to Github Container Registry - if: env.PUSH == 'true' uses: docker/login-action@v2 with: registry: ghcr.io