From ad2a3eb87ef64858d40ea5cae54dbed45c201ae6 Mon Sep 17 00:00:00 2001 From: Tiryoh Date: Thu, 17 Dec 2020 20:37:17 +0900 Subject: [PATCH 1/2] feat: Add Dockerfile for arm64 to support Apple Silicon --- melodic-arm64/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 melodic-arm64/Dockerfile diff --git a/melodic-arm64/Dockerfile b/melodic-arm64/Dockerfile new file mode 100644 index 0000000..3274235 --- /dev/null +++ b/melodic-arm64/Dockerfile @@ -0,0 +1,14 @@ +FROM dorowu/ubuntu-desktop-lxde-vnc:bionic-arm64 +LABEL maintainer="Tiryoh" + +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 From 27877ecb9b88d26d5135c27ba23354bb02f7835a Mon Sep 17 00:00:00 2001 From: Tiryoh Date: Sun, 18 Apr 2021 23:38:07 +0900 Subject: [PATCH 2/2] ci: Add arm64 --- .github/workflows/deploy.yml | 4 +++- .github/workflows/test.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1f12283..3248128 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 @@ -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 }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7c8302..950952c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: |