Allow to specify additional Docker args (#1)

Allow to specify additional `docker run` args

Co-authored-by: Jörn-Thorben Hinz <[email protected]>

Author: usimd

.github/workflows/test.yml

@@ -107,6 +107,24 @@ jobs:
           test -f debian/artifacts/test_1_amd64.buildinfo
           test -f debian/artifacts/test_1_amd64.changes
 
+  extra-docker-args:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: cat test/Makefile_extra-docker-args >> test/Makefile
+      - uses: ./
+        env:
+          DEB_BUILD_OPTIONS: noautodbgsym
+        with:
+          buildpackage-opts: --build=binary --no-sign
+          source-dir: test
+          extra-docker-args: --add-host extra-args-test:127.0.0.1
+      - run: |
+          dpkg --info debian/artifacts/test_1_amd64.deb
+          dpkg --contents debian/artifacts/test_1_amd64.deb | grep ./usr/bin/mybin
+          test -f debian/artifacts/test_1_amd64.buildinfo
+          test -f debian/artifacts/test_1_amd64.changes
+
   local-dockerfile:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -63,6 +63,13 @@ dependencies. To change this, pass `--install-recommends` in
 
 Optional and empty by default.
 
+#### `extra-docker-args`
+Additional command-line arguments passed to `docker run` when the build
+container is started. This might be needed if specific volumes or network
+settings are required.
+
+Optional and empty by default.
+
 #### `host-arch`
 The architecture packages are built for. If this parameter is set,
 cross-compilation is set up with `apt-get` and `dpkg-buildpackage` as described

action.yml

@@ -19,6 +19,9 @@ inputs:
   extra-build-deps:
     description: Extra packages to be installed as build dependencies
     required: false
+  extra-docker-args:
+    description: Additional arguments to 'docker run' when starting the build container
+    required: false
   host-arch:
     description: Foreign architecture to setup cross-compilation for
     required: false
@@ -38,6 +41,7 @@ runs:
         INPUT_HOST_ARCH: ${{ inputs.host-arch }}
         INPUT_DOCKER_IMAGE: ${{ inputs.docker-image }}
         INPUT_EXTRA_BUILD_DEPS: ${{ inputs.extra-build-deps }}
+        INPUT_EXTRA_DOCKER_ARGS: ${{ inputs.extra-docker-args }}
         INPUT_SOURCE_DIR: ${{ inputs.source-dir }}
       run: ${{ github.action_path }}/scripts/run.sh
       shell: bash

scripts/run.sh

@@ -76,6 +76,7 @@ fi
 start_group "Starting build container"
 env > "$env_file"
 container_id=$(docker run \
+	$INPUT_EXTRA_DOCKER_ARGS \
 	--detach \
 	--env-file="$env_file" \
 	--env=GITHUB_ACTION_PATH=/github/action \

test/Makefile_extra-docker-args

@@ -0,0 +1,4 @@
+
+.PHONY: test
+test:
+	test "$$(awk '$$2 == "extra-args-test" { print $$1 }' /etc/hosts)" = "127.0.0.1"