diff --git a/CHANGES.md b/CHANGES.md index 11c3a41..1ee254d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ - Add `dkml-target-abi-` and `dkml-host-abi-` when installing `dkml-base-compiler`. Related: Remove `ocaml_options = "ocaml-option-32bit"` for `windows_x86` matrix item that was now unused in dkml-base-compiler. - Remove unused `opam_abi` from the test matrix. - Add `--assume-depexts` during install of OCaml compiler. That means system packages are not auto-installed and your CI system will need to explicitly add any requirements like `g++-multilib gcc-multilib` for linux_x86. +- Show Dockerfile when a Docker container or dockcross is selected. ## 2.1.3 diff --git a/src/scripts/setup-dkml.sh b/src/scripts/setup-dkml.sh index b2e2983..47315e6 100755 --- a/src/scripts/setup-dkml.sh +++ b/src/scripts/setup-dkml.sh @@ -67,7 +67,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -85,7 +85,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml index 9d444cb..4c3288c 100644 --- a/test/gh-darwin/pre/action.yml +++ b/test/gh-darwin/pre/action.yml @@ -428,7 +428,7 @@ runs: "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -446,7 +446,7 @@ runs: install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/gh-linux/pre/action.yml b/test/gh-linux/pre/action.yml index 109b5d9..c1a9544 100644 --- a/test/gh-linux/pre/action.yml +++ b/test/gh-linux/pre/action.yml @@ -454,7 +454,7 @@ runs: "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -472,7 +472,7 @@ runs: install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/gh-windows/pre/action.yml b/test/gh-windows/pre/action.yml index 10417cf..1d91ff7 100644 --- a/test/gh-windows/pre/action.yml +++ b/test/gh-windows/pre/action.yml @@ -487,7 +487,7 @@ runs: "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -505,7 +505,7 @@ runs: install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml index 4907e7c..3a7265c 100644 --- a/test/gl/setup-dkml.gitlab-ci.yml +++ b/test/gl/setup-dkml.gitlab-ci.yml @@ -738,7 +738,7 @@ variables: "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -756,7 +756,7 @@ variables: install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -2767,7 +2767,7 @@ variables: "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -2785,7 +2785,7 @@ variables: install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -4515,7 +4515,7 @@ variables: "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -4533,7 +4533,7 @@ variables: install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/pc/setup-dkml-darwin_arm64.sh b/test/pc/setup-dkml-darwin_arm64.sh index f27176a..0411e3e 100644 --- a/test/pc/setup-dkml-darwin_arm64.sh +++ b/test/pc/setup-dkml-darwin_arm64.sh @@ -1225,7 +1225,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -1243,7 +1243,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/pc/setup-dkml-darwin_x86_64.sh b/test/pc/setup-dkml-darwin_x86_64.sh index 0e67c21..7011e54 100644 --- a/test/pc/setup-dkml-darwin_x86_64.sh +++ b/test/pc/setup-dkml-darwin_x86_64.sh @@ -1228,7 +1228,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -1246,7 +1246,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/pc/setup-dkml-linux_x86.sh b/test/pc/setup-dkml-linux_x86.sh index 03a6ec2..3823467 100644 --- a/test/pc/setup-dkml-linux_x86.sh +++ b/test/pc/setup-dkml-linux_x86.sh @@ -1231,7 +1231,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -1249,7 +1249,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/pc/setup-dkml-linux_x86_64.sh b/test/pc/setup-dkml-linux_x86_64.sh index 2b55c91..1af0ec9 100644 --- a/test/pc/setup-dkml-linux_x86_64.sh +++ b/test/pc/setup-dkml-linux_x86_64.sh @@ -1231,7 +1231,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -1249,7 +1249,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1 index 37a99b9..22bc0f1 100644 --- a/test/pc/setup-dkml-windows_x86.ps1 +++ b/test/pc/setup-dkml-windows_x86.ps1 @@ -1502,7 +1502,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -1520,7 +1520,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1 index 01f7c7f..181301e 100644 --- a/test/pc/setup-dkml-windows_x86_64.ps1 +++ b/test/pc/setup-dkml-windows_x86_64.ps1 @@ -1502,7 +1502,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${dockcross_image:-}" ]; then "${dockcross_packages_apt:-}" "${dockcross_packages_apt2:-}" "${dockcross_packages_apt3:-}" "${dockcross_packages_apt4:-}" "${dockcross_packages_apt5:-}" \ "${dockcross_packages_yum:-}" "${dockcross_packages_yum2:-}" "${dockcross_packages_yum3:-}" "${dockcross_packages_yum4:-}" "${dockcross_packages_yum5:-}" \ "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/dockcross:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations @@ -1520,7 +1520,7 @@ if [ "${in_docker:-}" = "true" ] && [ -n "${docker_image:-}" ]; then install -d .ci/sd4/docker-image printf "FROM %s\nRUN %s" "$docker_image" "${docker_assemble_command:-true}" \ - >.ci/sd4/docker-image/Dockerfile + |tee .ci/sd4/docker-image/Dockerfile docker build --quiet --tag "${docker_fqin_preusername}dkml-workflows/docker:latest" .ci/sd4/docker-image # Save image id to re-use for all remaining invocations