Fix for buildah

Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>

Author: jarrpa

build.sh

@@ -8,18 +8,17 @@ DRIVER="${DRIVER:-glusterfs-csi-driver}"
 # Set which docker repo to tag
 REPO="${REPO:-gluster/}"
 
-# Base image to use for final container images
-FINAL_BASE="${FINAL_BASE:-centos:7.5.1804}"
-
 # Allow overriding default docker command
-DOCKER_CMD=${DOCKER_CMD:-docker}
+RUNTIME_CMD=${RUNTIME_CMD:-docker}
+
+build="build"
+if [[ "${RUNTIME_CMD}" == "buildah" ]]; then
+  build="bud"
+fi
 
 # Allow disabling tests during build
 RUN_TESTS=${RUN_TESTS:-1}
 
-# Cleanup build context when done
-RM_BUILD=${RM_BUILD:-1}
-
 VERSION="$(git describe --dirty --always --tags | sed 's/-/./2' | sed 's/-/./2')"
 BUILDDATE="$(date -u '+%Y-%m-%dT%H:%M:%S.%NZ')"
 
@@ -32,27 +31,16 @@ build_args+=( --build-arg "RUN_TESTS=$RUN_TESTS" )
 build_args+=( --build-arg "GO_DEP_VERSION=$GO_DEP_VERSION" )
 build_args+=( --build-arg "GO_METALINTER_VERSION=$GO_METALINTER_VERSION" )
 build_args+=( --build-arg "GO_METALINTER_THREADS=$GO_METALINTER_THREADS" )
-build_args+=( --build-arg "FINAL_BASE=$FINAL_BASE" )
 build_args+=( --build-arg "version=$VERSION" )
 build_args+=( --build-arg "builddate=$BUILDDATE" )
 
 # Print Docker version
-echo "=== Docker Version ==="
-$DOCKER_CMD version
+echo "=== $RUNTIME_CMD version ==="
+$RUNTIME_CMD version
 
-# Run container build
-$DOCKER_CMD build \
-        -t glusterfs-csi-driver-build \
-        --target build \
-        "${build_args[@]}" \
-        -f pkg/glusterfs/Dockerfile \
-        . \
-|| exit 1
-
-#-- Build final container
-$DOCKER_CMD build \
+#-- Build container
+$RUNTIME_CMD $build \
         -t "${REPO}${DRIVER}" \
-        --target driver \
         "${build_args[@]}" \
         -f pkg/glusterfs/Dockerfile \
         . \
@@ -61,10 +49,6 @@ $DOCKER_CMD build \
 # If running tests, extract profile data
 if [ "$RUN_TESTS" -ne 0 ]; then
         rm -f profile.cov
-        $DOCKER_CMD run glusterfs-csi-driver-build \
-                cat /profile.cov > profile.cov
-fi
-
-if [ "$RM_BUILD" -ne 0 ]; then
-        $DOCKER_CMD rmi -f glusterfs-csi-driver-build
+        $RUNTIME_CMD run --entrypoint cat "${REPO}${DRIVER}" \
+                /profile.cov > profile.cov
 fi

pkg/glusterfs/Dockerfile

@@ -10,12 +10,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The base image to use for the final images
-ARG FINAL_BASE=centos
-
 #-- Create build environment
 
-FROM openshift/origin-release:golang-1.10 AS make_env
+FROM docker.io/openshift/origin-release:golang-1.10 as build
 
 ENV GOPATH="/go/" \
     SRCDIR="/go/src/github.com/gluster/gluster-csi-driver/" \
@@ -42,28 +39,26 @@ COPY scripts/ "${SCRIPTSDIR}"
 
 #-- Test phase
 
-FROM make_env AS test
 ARG RUN_TESTS=1
 ARG GO_METALINTER_THREADS=1
 ENV TEST_COVERAGE=stdout \
-    GO_COVER_OUT=/profile.cov
+    GO_COVER_DIR=/build/
 
+RUN mkdir /build
 RUN [ $RUN_TESTS -eq 0 ] || ${SCRIPTSDIR}/lint-go.sh
 RUN [ $RUN_TESTS -eq 0 ] || ${SCRIPTSDIR}/test-go.sh
 
 #-- Build phase
 
-FROM test AS build
-
 # Build executable
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags '-extldflags "-static"' -o /glusterfs-csi-driver cmd/glusterfs/main.go
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags '-extldflags "-static"' -o /build/glusterfs-csi-driver cmd/glusterfs/main.go
 
 # Ensure the binary is statically linked
-RUN ldd /glusterfs-csi-driver | grep -q "not a dynamic executable"
+RUN ldd /build/glusterfs-csi-driver | grep -q "not a dynamic executable"
 
 #-- Final container
 
-FROM ${FINAL_BASE} AS driver
+FROM docker.io/centos:7.5.1804 as final
 
 # Install dependencies
 RUN yum -y install centos-release-gluster && \
@@ -73,7 +68,7 @@ RUN yum -y install centos-release-gluster && \
     rpm -qa | grep gluster | tee /gluster-rpm-versions.txt
 
 # Copy glusterfs-csi-driver from build phase
-COPY --from=build /glusterfs-csi-driver /glusterfs-csi-driver
+COPY --from=build /build /
 
 # The version of the driver (git describe --dirty --always --tags | sed 's/-/./2' | sed 's/-/./2')
 ARG version="(unknown)"

scripts/test-go.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 GOPACKAGES="$(go list ./... | grep -v vendor | grep -v e2e)"
-COVERFILE="${GO_COVER_OUT:-profile.cov}"
+COVERFILE="${GO_COVER_DIR}profile.cov"
 
 # no special options, exec to go test w/ all pkgs
 if [[ ${TEST_EXITFIRST} != "yes" && -z ${TEST_COVERAGE} ]]; then