diff --git a/.github/workflows/ioes-hardware.yml b/.github/workflows/ioes-hardware.yml index 883867a..0c612d8 100644 --- a/.github/workflows/ioes-hardware.yml +++ b/.github/workflows/ioes-hardware.yml @@ -1,5 +1,5 @@ --- -name: Publish a Docker image (ARM64; Apple Silicon) +name: IOES-Hardware - Publish a Docker image (ARM64; Apple Silicon) # yamllint disable-line rule:truthy on: @@ -52,6 +52,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} file: docker-compose/ioes-hardware.dockerfile platforms: linux/arm64/v8 + no-cache: true build-args: | ROS_DISTRO=${{ env.ROS_DISTRO }} BRANCH=${{ env.BRANCH }} diff --git a/.github/workflows/ioes-simulator.yml b/.github/workflows/ioes-simulator.yml index 59b6ed9..5d93e03 100644 --- a/.github/workflows/ioes-simulator.yml +++ b/.github/workflows/ioes-simulator.yml @@ -1,5 +1,5 @@ --- -name: Publish a Docker image (ARM64; Apple Silicon) +name: IOES-Simulator - Publish a Docker image (ARM64; Apple Silicon) # yamllint disable-line rule:truthy on: @@ -52,6 +52,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} file: docker-compose/ioes-simulator.dockerfile platforms: linux/arm64/v8 + no-cache: true build-args: | ROS_DISTRO=${{ env.ROS_DISTRO }} BRANCH=${{ env.BRANCH }} diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index f13451f..70e1ce2 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -1,9 +1,10 @@ services: hardware: - build: - context: ./ # 도커파일 폴더 - dockerfile: ioes-hardware.dockerfile - image: ioes-hardware:latest + # build: + # context: ./ # 도커파일 폴더 + # dockerfile: ioes-hardware.dockerfile + # image: ioes-hardware:latest + image: ioeslab/ioes-hardware:latest command: /bin/bash tty: true diff --git a/docker-compose/ioes-hardware.dockerfile b/docker-compose/ioes-hardware.dockerfile index aa2de9f..6203092 100644 --- a/docker-compose/ioes-hardware.dockerfile +++ b/docker-compose/ioes-hardware.dockerfile @@ -24,6 +24,9 @@ RUN apt-get update && apt-get install -y \ ros-humble-demo-nodes-py && \ rm -rf /var/lib/apt/lists/* +# Ardupilot installation + + # setup entrypoint COPY ./ros_entrypoint.sh / RUN chmod +x /ros_entrypoint.sh