fix arch metadata for platform docker images

fix platform config_setting

update tfs_arm revision

Author: emacski

platforms/BUILD

@@ -24,7 +24,7 @@ config_setting(
     name = "is_linux_arm",
     constraint_values = [
         "@platforms//os:linux",
-        "@platforms//cpu:x86_64",
+        "@platforms//cpu:arm",
     ],
 )
 

tensorflow_model_server/main.cc

@@ -206,7 +206,7 @@ int main(int argc, char** argv) {
   if (display_version) {
     std::cout << "TensorFlow ModelServer: 1.15.0" << "\n"
               << "TensorFlow Library: " << TF_Version() << "\n"
-              << "TFS_ARM Rev: 1 (" << cBUILD_SCM_REV_STAMP << ")\n";
+              << "TFS_ARM Rev: 2 (" << cBUILD_SCM_REV_STAMP << ")\n";
     return 0;
   }
 

tensorflow_model_server/tools/ci/image_arch_fix.sh

@@ -25,6 +25,10 @@ platform=$2
 os="$(echo $platform | cut -d '_' -f1)"
 arch="$(echo $platform | cut -d '_' -f2)"
 
+if [ $arch = "amd64" ]; then
+    exit 0
+fi
+
 mkdir -p $work_dir
 cd $work_dir
 docker save $image -o image.tar

tensorflow_model_server/tools/ci/publish.sh

@@ -39,9 +39,7 @@ publish_platform_bundle() {
     # push platform image bundle
     for platform in $platforms; do
         # quick and dirty image arch metadata fix for arm images
-        if [ $platform = "linux_arm64" ] || [ $platform = "linux_arm" ]; then
-            tensorflow_model_server/tools/ci/image_arch_fix.sh $manifest-$platform $platform
-        fi
+        tensorflow_model_server/tools/ci/image_arch_fix.sh $manifest-$platform $platform
         docker push $manifest-$platform
     done
     # create and push manifest for arch image bundle
@@ -70,7 +68,10 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
 # individual images
 
 for platform in $PROJECT_PLATFORMS; do
-    docker push "$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION-$platform"
+    image_prefix=$PROJECT_REGISTRY_PREFIX:$UPSTREAM_TFS_VERSION
+    # quick and dirty image arch metadata fix for arm images
+    tensorflow_model_server/tools/ci/image_arch_fix.sh $image_prefix-$platform $platform
+    docker push "$image_prefix-$platform"
 done
 
 # aliases and manifest lists