docker: Allow interrupting packaging jobs with C-c.
Use the recommended exec syntax for the CMD directive in the Dockerfiles, which invokes the command directly rather than through an intermediate shell. Also provide the -i option, but conditionally as Docker checks if there is a real TTY to connect to, which is not the case in Jenkins. * scripts/make-packaging-target.py (PACKAGE_*_DOCKER_RUN_COMMAND) [IS_SHELL_INTERACTIVE]: Conditionally provide the '-i' option. (package-*-interactive) <DOCKER_EXTRA_ARGS>: Remove target-specific variable. (DOCKER_EXTRA_ARGS): Move/rename variable to ... * Makefile (DOCKER_RUN_EXTRA_ARGS): ... here/this. (IS_SHELL_INTERACTIVE): New variable. The rest of this change was automated using the command: $ git grep -l CMD | xargs sed -i -E 's,CMD (.*)$,CMD ["\1"],g' Change-Id: I93ba9ad8115541a7c7f02421384ae01a5b0650ad
Showing
- Makefile 6 additions, 0 deletionsMakefile
- docker/Dockerfile_debian_10 1 addition, 1 deletiondocker/Dockerfile_debian_10
- docker/Dockerfile_debian_testing 1 addition, 1 deletiondocker/Dockerfile_debian_testing
- docker/Dockerfile_debian_unstable 1 addition, 1 deletiondocker/Dockerfile_debian_unstable
- docker/Dockerfile_fedora_32 1 addition, 1 deletiondocker/Dockerfile_fedora_32
- docker/Dockerfile_fedora_33 1 addition, 1 deletiondocker/Dockerfile_fedora_33
- docker/Dockerfile_fedora_34 1 addition, 1 deletiondocker/Dockerfile_fedora_34
- docker/Dockerfile_opensuse-leap_15.2 1 addition, 1 deletiondocker/Dockerfile_opensuse-leap_15.2
- docker/Dockerfile_opensuse-leap_15.3 1 addition, 1 deletiondocker/Dockerfile_opensuse-leap_15.3
- docker/Dockerfile_opensuse-tumbleweed 1 addition, 1 deletiondocker/Dockerfile_opensuse-tumbleweed
- docker/Dockerfile_raspbian_10_armhf 1 addition, 1 deletiondocker/Dockerfile_raspbian_10_armhf
- docker/Dockerfile_rhel_8 1 addition, 1 deletiondocker/Dockerfile_rhel_8
- docker/Dockerfile_ubuntu_18.04 1 addition, 1 deletiondocker/Dockerfile_ubuntu_18.04
- docker/Dockerfile_ubuntu_20.04 1 addition, 1 deletiondocker/Dockerfile_ubuntu_20.04
- docker/Dockerfile_ubuntu_20.10 1 addition, 1 deletiondocker/Dockerfile_ubuntu_20.10
- docker/Dockerfile_ubuntu_21.04 1 addition, 1 deletiondocker/Dockerfile_ubuntu_21.04
- patches/docker-snap-build-scripts.patch 1 addition, 1 deletionpatches/docker-snap-build-scripts.patch
- scripts/make-packaging-target.py 2 additions, 4 deletionsscripts/make-packaging-target.py
Loading
Please register or sign in to comment