Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b3f93a1

Browse filesBrowse files
author
Takashi Matsuo
committed
change TRAMPOLINE_IMAGE_SOURCE to TRAMPOLINE_DOCKERFILE
1 parent eb19cdc commit b3f93a1
Copy full SHA for b3f93a1

File tree

Expand file treeCollapse file tree

4 files changed

+10
-10
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+10
-10
lines changed

‎.kokoro/trampoline_v2.sh

Copy file name to clipboardExpand all lines: .kokoro/trampoline_v2.sh
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# You can optionally change these environment variables:
3636
#
3737
# TRAMPOLINE_IMAGE: The docker image to use.
38-
# TRAMPOLINE_IMAGE_SOURCE: The location of the Dockerfile.
38+
# TRAMPOLINE_DOCKERFILE: The location of the Dockerfile.
3939
# TRAMPOLINE_IMAGE_UPLOAD:
4040
# (true|false): Whether to upload the Docker image after the
4141
# successful builds.
@@ -219,11 +219,11 @@ user_name="$(id -un)"
219219
docker_gid=$(cut -d: -f3 < <(getent group docker))
220220

221221
update_cache="false"
222-
if [[ "${TRAMPOLINE_IMAGE_SOURCE:-none}" != "none" ]]; then
222+
if [[ "${TRAMPOLINE_DOCKERFILE:-none}" != "none" ]]; then
223223
# Build the Docker image from the source.
224-
context_dir=$(dirname "${TRAMPOLINE_IMAGE_SOURCE}")
224+
context_dir=$(dirname "${TRAMPOLINE_DOCKERFILE}")
225225
docker_build_flags=(
226-
"-f" "${TRAMPOLINE_IMAGE_SOURCE}"
226+
"-f" "${TRAMPOLINE_DOCKERFILE}"
227227
"-t" "${TRAMPOLINE_IMAGE}"
228228
"--build-arg" "UID=${user_uid}"
229229
"--build-arg" "GID=${user_gid}"

‎.trampolinerc

Copy file name to clipboardExpand all lines: .trampolinerc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
4545
TRAMPOLINE_IMAGE="gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
4646
fi
4747

48-
if [[ -z "${TRAMPOLINE_IMAGE_SOURCE:-}" ]]; then
49-
TRAMPOLINE_IMAGE_SOURCE=".kokoro/docker/Dockerfile"
48+
if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
49+
TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
5050
fi
5151

5252
if [[ -z "${RUN_TESTS_SESSION:-}" ]]; then

‎.trampolinerc_tmpl

Copy file name to clipboardExpand all lines: .trampolinerc_tmpl
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
3737
# TRAMPOLINE_IMAGE="gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
3838
fi
3939

40-
if [[ -z "${TRAMPOLINE_IMAGE_SOURCE:-}" ]]; then
41-
# TRAMPOLINE_IMAGE_SOURCE=".kokoro/docker/Dockerfile"
40+
if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
41+
# TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
4242
fi
4343

4444
if [[ -z "${TRAMPOLINE_BUILD_FILE:-}" ]]; then

‎scripts/run_tests_local.sh

Copy file name to clipboardExpand all lines: scripts/run_tests_local.sh
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ directory="$(realpath "$1")"
5454
relative_dir=${directory#"${PROJECT_ROOT}/"}
5555
export RUN_TESTS_DIRS="${relative_dir}"
5656

57-
if [[ -z "${TRAMPOLINE_IMAGE_SOURCE:-}" ]]; then
58-
export TRAMPOLINE_IMAGE_SOURCE="none"
57+
if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
58+
export TRAMPOLINE_DOCKERFILE="none"
5959
fi
6060

6161
if [[ $# -ge 2 ]]; then

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.