Skip to content

Commit c7cfb8e

Browse files
committed
gh: fix docker settings for CI
1 parent 6b3dc06 commit c7cfb8e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.docker/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG IMAGE_PREFIX=""
22
ARG ROS_DISTRO=noetic
3-
FROM ${IMAGE_PREFIX}ros:${ROS_DISTRO}-ros-base AS base
3+
ARG BASE_DOCKER_NAME=${ROS_DISTRO}
4+
FROM ${IMAGE_PREFIX}ros:${BASE_DOCKER_NAME}-ros-base AS base
45

56
ENV TERM xterm
67
ENV IN_DOCKER 1

.github/workflows/docker.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
ROS_DISTRO: [noetic, jammy]
25+
ROS_DISTRO: [noetic, one]
2626
runs-on: ubuntu-latest
2727
permissions:
2828
packages: write
@@ -58,8 +58,9 @@ jobs:
5858
file: .docker/Dockerfile
5959
build-args: |
6060
ROS_DISTRO=${{ matrix.ROS_DISTRO }}
61+
BASE_DOCKER_NAME=${{ matrix.ROS_DISTRO == 'one' && 'jammy' || matrix.ROS_DISTRO }}
6162
MUJOCO_VERSIONS=${{ env.MUJOCO_VERSIONS }}
62-
IMAGE_PREFIX=${{ matrix.ROS_DISTRO == 'jammy' && 'ubiagni/' || '' }}
63+
IMAGE_PREFIX=${{ matrix.ROS_DISTRO == 'one' && 'ubiagni/' || '' }}
6364
push: true
6465
no-cache: ${{ steps.apt.outputs.no_cache || github.event_name == 'workflow_dispatch' }}
6566
cache-from: type=registry,ref=${{ env.IMAGE }}

0 commit comments

Comments
 (0)