Skip to content
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

Jump to bottom

Update to run on SNP 4.4 #8

Merged
merged 1 commit into from
May 24, 2024
Merged

Update to run on SNP 4.4 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ jobs:
context: .
file: docker/Dockerfile
build-args: |
TAG=${{ matrix.distro }}-master
ROS_DISTRO=${{ matrix.distro }}
TAG=${{ matrix.distro }}-4.4
push: ${{ env.PUSH_DOCKER_IMAGE }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
distro: [foxy]
container:
image: ghcr.io/ros-industrial-consortium/scan_n_plan_workshop:${{ matrix.distro }}-master
image: ghcr.io/ros-industrial-consortium/scan_n_plan_workshop:${{ matrix.distro }}-4.4
env:
CCACHE_DIR: ${{ github.workspace }}/${{ matrix.distro }}/.ccache
DEBIAN_FRONTEND: noninteractive
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
context: ..
dockerfile: docker/Dockerfile
args:
- TAG=foxy-master
- TAG=foxy-4.4
environment:
DISPLAY: $DISPLAY
XAUTHORITY: $XAUTHORITY
Expand All @@ -14,7 +14,7 @@ services:
ROS_LOCALHOST_ONLY: $ROS_LOCALHOST_ONLY
ROS_DOMAIN_ID: $ROS_DOMAIN_ID
container_name: snp_automate_2022
image: ghcr.io/ros-industrial-consortium/snp_automate_2022:foxy-master
image: ghcr.io/ros-industrial-consortium/snp_automate_2022:foxy-4.4
stdin_open: true
tty: true
network_mode: host
Expand Down Expand Up @@ -63,4 +63,4 @@ services:
# Share the network with the host PC
network_mode: host
ipc: host
pid: host
pid: host