Skip to content

Commit

Permalink
Revert to rolling
Browse files Browse the repository at this point in the history
  • Loading branch information
ruffsl committed Jul 6, 2021
1 parent 4ec61bf commit d96b21f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/update_ci_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ jobs:
cache-from: type=registry,ref=ghcr.io/ros-planning/navigation2:main
cache-to: type=inline
target: builder
build-args: |
FROM_STAGE=integration
tags: |
ghcr.io/ros-planning/navigation2:main
ghcr.io/ros-planning/navigation2:main-${{ steps.config.outputs.timestamp }}
Expand Down
13 changes: 3 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,12 @@
# docker build -t nav2:latest \
# --build-arg UNDERLAY_MIXINS \
# --build-arg OVERLAY_MIXINS ./
ARG FROM_IMAGE=osrf/ros2:testing
ARG FROM_STAGE=development
ARG FROM_IMAGE=ros:rolling
ARG UNDERLAY_WS=/opt/underlay_ws
ARG OVERLAY_WS=/opt/overlay_ws

# multi-stage for development
FROM $FROM_IMAGE AS development

# multi-stage for integration
FROM osrf/ros2:testing-20210605003201 AS integration

# multi-stage for caching
FROM $FROM_STAGE AS cacher
FROM $FROM_IMAGE AS cacher

# clone underlay source
ARG UNDERLAY_WS
Expand All @@ -42,7 +35,7 @@ RUN find . -name "src" -type d \
| xargs cp --parents -t /tmp/opt || true

# multi-stage for building
FROM $FROM_STAGE AS builder
FROM $FROM_IMAGE AS builder

# config dependencies install
ARG DEBIAN_FRONTEND=noninteractive
Expand Down

0 comments on commit d96b21f

Please sign in to comment.