YETUS-814. docker hub builds are out of sync

Signed-off-by: Allen Wittenauer <aw@apache.org>

hooks/build

@@ -14,14 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if [[ -n "${DOCKERFILE_PATH}" ]]; then
-  docker build -t "${IMAGE_NAME}" \
-    --build-arg DOCKER_TAG="${DOCKER_TAG}" \
-    --build-arg DOCKER_REPO="${DOCKER_REPO}" \
-    -f "${DOCKERFILE_PATH}"
-else
-  docker build -t "${IMAGE_NAME}" \
-    --build-arg DOCKER_TAG="${DOCKER_TAG}" \
-    --build-arg DOCKER_REPO="${DOCKER_REPO}" \
-    .
-fi
+GIT_URL=$(git config --get remote.origin.url)
+
+# Build the -base image
+docker build \
+  --label "git-commit-sha=${SOURCE_COMMIT}" \
+  --label "git-commit-branch=${SOURCE_BRANCH}" \
+  --label "git-commit-url=${GIT_URL}" \
+  --tag "${DOCKER_REPO}-base:${DOCKER_TAG}" \
+  precommit/src/main/shell/test-patch-docker
+
+# Build the full image using base above
+docker build \
+  --label "git-commit-sha=${SOURCE_COMMIT}" \
+  --label "git-commit-branch=${SOURCE_BRANCH}" \
+  --label "git-commit-url=${GIT_URL}" \
+  --tag "${DOCKER_REPO}:${DOCKER_TAG}" \
+  --build-arg DOCKER_TAG="${DOCKER_TAG}" \
+  --build-arg DOCKER_REPO="${DOCKER_REPO}" \
+  .

hooks/push

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+docker push "${DOCKER_REPO}-base:${DOCKER_TAG}"
+docker push "${DOCKER_REPO}:${DOCKER_TAG}"