[docker] deprecate vcs-upstream label

Closes: aptos-labs#8216
gpashu87 · Apr 16, 2021 · 9ed2283 · 9ed2283
1 parent c2eabac
commit 9ed2283
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 26 deletions.
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
@@ -45,4 +45,3 @@ ARG GIT_UPSTREAM
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.build-date=$BUILD_DATE
 LABEL org.label-schema.vcs-ref=$GIT_REV
-LABEL vcs-upstream=$GIT_UPSTREAM
diff --git a/docker/cluster-test/Dockerfile b/docker/cluster-test/Dockerfile
@@ -33,4 +33,3 @@ ARG GIT_UPSTREAM
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.build-date=$BUILD_DATE
 LABEL org.label-schema.vcs-ref=$GIT_REV
-LABEL vcs-upstream=$GIT_UPSTREAM
diff --git a/docker/diem-build.sh b/docker/diem-build.sh
@@ -74,7 +74,6 @@ fi
 for _ in seq 1 2; do
   if docker build -f $DOCKERFILE $DIR/.. $TAGS \
     --build-arg GIT_REV="$(git rev-parse HEAD)" \
-    --build-arg GIT_UPSTREAM="$(git merge-base HEAD origin/master)" \
     --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
     --build-arg ENABLE_FAILPOINTS="$ENABLE_FAILPOINTS" \
     $PROXY \

diff --git a/docker/faucet/Dockerfile b/docker/faucet/Dockerfile
@@ -50,4 +50,3 @@ ARG GIT_UPSTREAM
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.build-date=$BUILD_DATE
 LABEL org.label-schema.vcs-ref=$GIT_REV
-LABEL vcs-upstream=$GIT_UPSTREAM
diff --git a/docker/init/Dockerfile b/docker/init/Dockerfile
@@ -44,4 +44,3 @@ ARG GIT_UPSTREAM
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.build-date=$BUILD_DATE
 LABEL org.label-schema.vcs-ref=$GIT_REV
-LABEL vcs-upstream=$GIT_UPSTREAM
diff --git a/docker/tag-and-push.sh b/docker/tag-and-push.sh
diff --git a/docker/tools/Dockerfile b/docker/tools/Dockerfile
@@ -52,4 +52,3 @@ ARG GIT_UPSTREAM
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.build-date=$BUILD_DATE
 LABEL org.label-schema.vcs-ref=$GIT_REV
-LABEL vcs-upstream=$GIT_UPSTREAM
diff --git a/docker/validator/Dockerfile b/docker/validator/Dockerfile
@@ -52,4 +52,3 @@ ARG GIT_UPSTREAM
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.build-date=$BUILD_DATE
 LABEL org.label-schema.vcs-ref=$GIT_REV
-LABEL vcs-upstream=$GIT_UPSTREAM