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 3, 2021
1 parent 4ec61bf commit 4c639d6
Showing 1 changed file with 3 additions and 10 deletions.
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 4c639d6

Please sign in to comment.