Skip to content

Commit b4035e5

Browse files
authored
Deletes unnecessary license gathering scripts from the release process.
* Delete license.sh * Delete third_party_licenses.csv * Update build_docker_image.sh * Update Dockerfile
1 parent 76616b0 commit b4035e5

File tree

4 files changed

+1
-302
lines changed

4 files changed

+1
-302
lines changed

tfx/tools/docker/Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,5 @@ RUN patch /opt/venv/lib/python3.6/site-packages/googleapiclient/http.py \
5252
patch /opt/venv/lib/python3.6/site-packages/apitools/base/py/base_api.py \
5353
/tfx-src/tfx/tools/docker/patches/base_api.patch
5454

55-
# TODO(zhitaoli): Ensure that license dependency is an exact match instead of
56-
# subset check.
57-
ARG gather_third_party_licenses=true
58-
RUN if [ "${gather_third_party_licenses}" = "true" ]; then \
59-
/tfx-src/tfx/tools/docker/license.sh \
60-
/tfx-src/tfx/tools/docker/third_party_licenses.csv \
61-
/third_party/licenses; \
62-
fi
63-
6455
# TODO(b/139532550): Consolidate container entrypoint with Kubeflow runner.
6556
ENTRYPOINT ["python3.6", "/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 & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)