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.

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

feat: Add Dockerfile for arm64 to support Apple Silicon #16

Merged
merged 3 commits into from
Apr 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
build-and-deploy:
strategy:
matrix:
ros-distro: [kinetic, melodic, noetic, noetic-testing]
ros-distro: [kinetic, melodic, melodic-arm64, noetic, noetic-testing]
experimental: [false]
include:
- ros-distro: noetic-testing
Expand All @@ -29,6 +29,8 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: docker/setup-qemu-action@v1

- name: Build docker image
env:
DOCKER_TAGNAME: ${{ matrix.ros-distro }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ jobs:
continue-on-error: true
strategy:
matrix:
ros-distro: [kinetic, melodic, noetic, noetic-testing]
ros-distro: [kinetic, melodic, melodic-arm64, noetic, noetic-testing]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: docker/setup-qemu-action@v1

- name: Build docker image
id: docker
run: |
Expand Down
14 changes: 14 additions & 0 deletions melodic-arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM dorowu/ubuntu-desktop-lxde-vnc:bionic-arm64
LABEL maintainer="Tiryoh<[email protected]>"

RUN apt-get update -q && \
apt-get upgrade -yq && \
apt-get install -yq wget curl git build-essential vim sudo lsb-release locales bash-completion tzdata gosu && \
rm -rf /var/lib/apt/lists/*
RUN useradd --create-home --home-dir /home/ubuntu --shell /bin/bash --user-group --groups adm,sudo ubuntu && \
echo ubuntu:ubuntu | chpasswd && \
echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
RUN git clone https://github.com/Tiryoh/ros_setup_scripts_ubuntu.git /tmp/ros_setup_scripts_ubuntu && \
gosu ubuntu /tmp/ros_setup_scripts_ubuntu/ros-melodic-desktop.sh && \
rm -rf /var/lib/apt/lists/*
ENV USER ubuntu