Merge branch 'bugfix/dockerfile_set_idf_branch_v4.0' into 'release/v4.0'
tools/docker: use correct branch and commit of IDF when building (backport v4.0) See merge request espressif/esp-idf!6665
This commit is contained in:
commit
35b91ebf2d
2 changed files with 15 additions and 0 deletions
|
@ -51,6 +51,7 @@ tools/ci/test_configure_ci_environment.sh
|
||||||
tools/cmake/convert_to_cmake.py
|
tools/cmake/convert_to_cmake.py
|
||||||
tools/cmake/run_cmake_lint.sh
|
tools/cmake/run_cmake_lint.sh
|
||||||
tools/docker/entrypoint.sh
|
tools/docker/entrypoint.sh
|
||||||
|
tools/docker/hooks/build
|
||||||
tools/elf_to_ld.sh
|
tools/elf_to_ld.sh
|
||||||
tools/esp_app_trace/logtrace_proc.py
|
tools/esp_app_trace/logtrace_proc.py
|
||||||
tools/esp_app_trace/sysviewtrace_proc.py
|
tools/esp_app_trace/sysviewtrace_proc.py
|
||||||
|
|
14
tools/docker/hooks/build
Executable file
14
tools/docker/hooks/build
Executable file
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# This file gets executed to build the image on the Docker Hub.
|
||||||
|
# See https://docs.docker.com/docker-hub/builds/advanced/#build-hook-examples for details.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
echo "Building for branch ${SOURCE_BRANCH}, commit ${SOURCE_COMMIT}"
|
||||||
|
|
||||||
|
docker build \
|
||||||
|
--build-arg IDF_CLONE_BRANCH_OR_TAG=${SOURCE_BRANCH} \
|
||||||
|
--build-arg IDF_CHECKOUT_REF=${SOURCE_COMMIT} \
|
||||||
|
-f $DOCKERFILE_PATH \
|
||||||
|
-t $IMAGE_NAME .
|
Loading…
Reference in a new issue