Преглед изворни кода

Merge branch 'bugfix/dockerfile_set_idf_branch' into 'master'

tools/docker: use correct branch and commit of IDF when building

Closes IDF-1120

See merge request espressif/esp-idf!6584
Ivan Grokhotkov пре 6 година
родитељ
комит
d459f7bfe0
2 измењених фајлова са 15 додато и 0 уклоњено
  1. 1 0
      tools/ci/executable-list.txt
  2. 14 0
      tools/docker/hooks/build

+ 1 - 0
tools/ci/executable-list.txt

@@ -53,6 +53,7 @@ tools/ci/test_configure_ci_environment.sh
 tools/cmake/convert_to_cmake.py
 tools/cmake/run_cmake_lint.sh
 tools/docker/entrypoint.sh
+tools/docker/hooks/build
 tools/elf_to_ld.sh
 tools/esp_app_trace/logtrace_proc.py
 tools/esp_app_trace/sysviewtrace_proc.py

+ 14 - 0
tools/docker/hooks/build

@@ -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 .