Skip to content

Commit d352f12

Browse files
authored
Deletes unnecessary license gathering scripts from the release process.
* Update RELEASE.md * Update RELEASE.md * Update README.md * Update version.py * Update dependencies.py * Update RELEASE.md * Update RELEASE.md * Update Dockerfile * Update build_docker_image.sh * Delete license.sh * Delete third_party_licenses.csv * Update test_utils.py
1 parent b5dd4f1 commit d352f12

File tree

5 files changed

+1
-157
lines changed

5 files changed

+1
-157
lines changed

tfx/orchestration/test_utils.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ def build_and_push_docker_image(container_image: str, repo_base: str):
7575
path=repo_base,
7676
dockerfile='tfx/tools/docker/Dockerfile',
7777
tag=container_image,
78-
buildargs={
79-
# Skip license gathering for tests.
80-
'gather_third_party_licenses': 'false',
81-
},
8278
)
8379

8480
logging.info('Pushing image %s', container_image)

tfx/tools/docker/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ RUN patch `python -c 'import googleapiclient; print(googleapiclient.__path__[0])
4444
patch `python -c 'import apitools; print(apitools.__path__[0])'`/base/py/base_api.py \
4545
/tfx-src/tfx/tools/docker/patches/base_api.patch
4646

47-
ARG gather_third_party_licenses=true
48-
RUN if [ "${gather_third_party_licenses}" = "true" ]; then \
49-
/tfx-src/tfx/tools/docker/license.sh \
50-
/tfx-src/tfx/tools/docker/third_party_licenses.csv \
51-
/third_party/licenses; \
52-
fi
5347

5448
# TODO(b/139532550): Consolidate container entrypoint with Kubeflow runner.
5549
ENTRYPOINT ["python", "/tfx-src/tfx/scripts/run_executor.py"]

tfx/tools/docker/build_docker_image.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ set -u -x
1919
DOCKER_IMAGE_REPO=${DOCKER_IMAGE_REPO:-"tensorflow/tfx"}
2020
DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG:-"latest"}
2121
DOCKER_FILE=${DOCKER_FILE:-"Dockerfile"}
22-
GATHER_THIRD_PARTY_LICENSES=${GATHER_THIRD_PARTY_LICENSES:-"true"}
2322

2423
# Run docker build command.
25-
docker build -t ${DOCKER_IMAGE_REPO}:${DOCKER_IMAGE_TAG} -f tfx/tools/docker/${DOCKER_FILE} . --build-arg gather_third_party_licenses=${GATHER_THIRD_PARTY_LICENSES} "$@"
24+
docker build -t ${DOCKER_IMAGE_REPO}:${DOCKER_IMAGE_TAG} -f tfx/tools/docker/${DOCKER_FILE} . "$@"

tfx/tools/docker/license.sh

Lines changed: 0 additions & 106 deletions
This file was deleted.

tfx/tools/docker/third_party_licenses.csv

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)