set default arg in Dockerfile for multiple stages

ika-rwth-aachen · Jun 16, 2023 · c23810a · c23810a
1 parent 4894a03
commit c23810a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.1.0
+      - uses: ika-rwth-aachen/docker-ros@v1.2.0
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -110,7 +110,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.1.0/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.0/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -129,7 +129,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.1.0
+      - uses: ika-rwth-aachen/docker-ros@v1.2.0
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -142,7 +142,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.1.0/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.0/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -162,7 +162,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.1.0
+      - uses: ika-rwth-aachen/docker-ros@v1.2.0
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -176,7 +176,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.1.0/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.0/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -197,7 +197,7 @@ jobs:
   docker-ros:
     runs-on: ubuntu-latest
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.1.0
+      - uses: ika-rwth-aachen/docker-ros@v1.2.0
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node
@@ -210,7 +210,7 @@ jobs:
 
 ```yml
 include:
-  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.1.0/.gitlab-ci/docker-ros.yml
+  - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/v1.2.0/.gitlab-ci/docker-ros.yml
 
 variables:
   BASE_IMAGE: rwthika/ros2:humble
@@ -234,7 +234,7 @@ jobs:
         platform: [amd64, arm64]  
     runs-on: [self-hosted, "${{ matrix.platform }}"]
     steps:
-      - uses: ika-rwth-aachen/docker-ros@v1.1.0
+      - uses: ika-rwth-aachen/docker-ros@v1.2.0
         with:
           base-image: rwthika/ros2:humble
           command: ros2 run my_pkg my_node

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -144,7 +144,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # copy contents of files-folder into image
-ARG ADDITIONAL_FILES_DIR
+ARG ADDITIONAL_FILES_DIR="docker/additional-files"
 ADD ${ADDITIONAL_FILES_DIR}* /docker-ros/additional-files/
 
 # install essential build tools and dependencies for install script

diff --git a/templates/docker-compose.template.yml b/templates/docker-compose.template.yml
@@ -11,11 +11,19 @@ x-build: &build
   args:
     BASE_IMAGE: *base-image
     COMMAND: *command
+    ADDITIONAL_DEBS_FILE: $ADDITIONAL_DEBS_FILE
+    ADDITIONAL_FILES_DIR: $ADDITIONAL_FILES_DIR
+    ADDITIONAL_PIP_FILE: $ADDITIONAL_PIP_FILE
+    CUSTOM_SCRIPT_FILE: $CUSTOM_SCRIPT_FILE
+    ENABLE_RECURSIVE_ADDITIONAL_DEBS: $ENABLE_RECURSIVE_ADDITIONAL_DEBS
+    ENABLE_RECURSIVE_ADDITIONAL_PIP: $ENABLE_RECURSIVE_ADDITIONAL_PIP
+    ENABLE_RECURSIVE_CUSTOM_SCRIPT: $ENABLE_RECURSIVE_CUSTOM_SCRIPT
+    GIT_HTTPS_PASSWORD: $GIT_HTTPS_PASSWORD
     GIT_HTTPS_SERVER: $GIT_HTTPS_SERVER
     GIT_HTTPS_USER: $GIT_HTTPS_USER
-    GIT_HTTPS_PASSWORD: $GIT_HTTPS_PASSWORD
-    GIT_SSH_PRIVATE_KEY: $GIT_SSH_PRIVATE_KEY
     GIT_SSH_KNOWN_HOST_KEYS: $GIT_SSH_KNOWN_HOST_KEYS
+    GIT_SSH_PRIVATE_KEY: $GIT_SSH_PRIVATE_KEY
+    ROS_DISTRO: $ROS_DISTRO
 
 services:
   dev:
@@ -27,4 +35,4 @@ services:
     image: *run-image
     build:
       target: run
-      <<: *build
+      <<: *build