Skip to content

Commit 2e7c3f0

Browse files
committed
remove image_arch_fix.sh script
update rules_docker to latest which now supports an architecture field
1 parent 2138d02 commit 2e7c3f0

File tree

3 files changed

+5
-48
lines changed

3 files changed

+5
-48
lines changed

Diff for: tensorflow_model_server/BUILD

+5
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ container_layer(
9797
":linux_arm64": "@discolix_cc_linux_arm64" + suffix + "//image",
9898
":linux_amd64": "@discolix_cc_linux_amd64" + suffix + "//image",
9999
}),
100+
architecture = select({
101+
":linux_arm": "arm",
102+
":linux_arm64": "arm64",
103+
":linux_amd64": "amd64",
104+
}),
100105
directory = "/usr/bin/",
101106
entrypoint = ["tf_serving_entrypoint.sh"],
102107
env = {

Diff for: tensorflow_model_server/tools/ci/image_arch_fix.sh

-42
This file was deleted.

Diff for: tensorflow_model_server/tools/ci/publish.sh

-6
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ publish_platform_bundle() {
3838
local manifest=$1; local platforms="$2"
3939
# push platform image bundle
4040
for platform in $platforms; do
41-
# quick and dirty image arch metadata fix for arm images
42-
tensorflow_model_server/tools/ci/image_arch_fix.sh $manifest-$platform $platform
4341
docker push $manifest-$platform
4442
done
4543
# create and push manifest for arch image bundle
@@ -69,8 +67,6 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
6967

7068
for platform in $PROJECT_PLATFORMS; do
7169
image_prefix=$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION
72-
# quick and dirty image arch metadata fix for arm images
73-
tensorflow_model_server/tools/ci/image_arch_fix.sh $image_prefix-$platform $platform
7470
docker push "$image_prefix-$platform"
7571
done
7672

@@ -89,8 +85,6 @@ publish_platform_bundle "$PROJECT_REGISTRY_PREFIX:latest" "$GENERIC_PLATFORMS"
8985

9086
for platform in $PROJECT_PLATFORMS; do
9187
image_prefix="$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-debug"
92-
# quick and dirty image arch metadata fix for arm images
93-
tensorflow_model_server/tools/ci/image_arch_fix.sh $image_prefix-$platform $platform
9488
docker push "$image_prefix-$platform"
9589
done
9690

0 commit comments

Comments
 (0)