Skip to content

Commit

Permalink
Deletes unnecessary license gathering scripts from the release process.
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dhruvesh09 authored Sep 24, 2020
1 parent b5dd4f1 commit d352f12
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 157 deletions.
4 changes: 0 additions & 4 deletions tfx/orchestration/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ def build_and_push_docker_image(container_image: str, repo_base: str):
path=repo_base,
dockerfile='tfx/tools/docker/Dockerfile',
tag=container_image,
buildargs={
# Skip license gathering for tests.
'gather_third_party_licenses': 'false',
},
)

logging.info('Pushing image %s', container_image)
Expand Down
6 changes: 0 additions & 6 deletions tfx/tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ RUN patch `python -c 'import googleapiclient; print(googleapiclient.__path__[0])
patch `python -c 'import apitools; print(apitools.__path__[0])'`/base/py/base_api.py \
/tfx-src/tfx/tools/docker/patches/base_api.patch

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

# TODO(b/139532550): Consolidate container entrypoint with Kubeflow runner.
ENTRYPOINT ["python", "/tfx-src/tfx/scripts/run_executor.py"]
3 changes: 1 addition & 2 deletions tfx/tools/docker/build_docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ set -u -x
DOCKER_IMAGE_REPO=${DOCKER_IMAGE_REPO:-"tensorflow/tfx"}
DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG:-"latest"}
DOCKER_FILE=${DOCKER_FILE:-"Dockerfile"}
GATHER_THIRD_PARTY_LICENSES=${GATHER_THIRD_PARTY_LICENSES:-"true"}

# Run docker build command.
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} "$@"
docker build -t ${DOCKER_IMAGE_REPO}:${DOCKER_IMAGE_TAG} -f tfx/tools/docker/${DOCKER_FILE} . "$@"
106 changes: 0 additions & 106 deletions tfx/tools/docker/license.sh

This file was deleted.

39 changes: 0 additions & 39 deletions tfx/tools/docker/third_party_licenses.csv

This file was deleted.

0 comments on commit d352f12

Please sign in to comment.