Publish image of ISAR with turtlebot

.github/workflows/publish_docker_image.yml

@@ -12,13 +12,14 @@ name: Create and publish a Docker image
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-and-push-image:
+  build-and-push-simulator:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -39,12 +40,45 @@ jobs:
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-simulator
 
       - name: Build and push Docker image
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
+          file: Dockerfile.Simulator
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  build-and-push-isar-with-turtlebot:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: Dockerfile.Isar
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile.Isar

@@ -0,0 +1,10 @@
+FROM ghcr.io/equinor/isar:latest
+
+ARG ROBOT_REPOSITORY_CLONE_URL=https://github.com/equinor/isar-turtlebot.git
+
+RUN pip install git+${ROBOT_REPOSITORY_CLONE_URL}@main
+
+RUN useradd -ms /bin/bash --uid 1001 isar
+RUN chown -R 1001 /app
+RUN chmod 755 /app
+USER 1001

README.md

@@ -59,7 +59,7 @@ docker-compose up --build
 
 The simulation world that is used can be set by changing the world variable in the 'entrypoint.sh' file.
 
-Additional settings, such as using Nvidia GPU or gamepad input to the docker container is included via separate .yml-files. To run the docker container with these settings the corresponding `docker-compose-setting.yml` file must be spesified together with the main `docker-compose.yml` file. Several setting files can be included.
+Additional settings, such as using Nvidia GPU or gamepad input to the docker container is included via separate .yml-files. To run the docker container with these settings the corresponding `docker-compose-setting.yml` file must be specified together with the main `docker-compose.yml` file. Several setting files can be included.
 
 ```bash
 docker-compose -f docker-compose.yml -f docker-compose-setting.yml up --build

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     container_name: turtle_sim
     build:
       context: ./
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.Simulator
     ports:
       - "9090:9090"
       - "5000:5000"