rpc: skip phase updates on checking cache and priming cache step

These steps are mapped to the same phase as pulling, and therefore
won't be seen as changed from Quay.

Prevent builds to move forward in if error reading/writing from/to log
stream, as it doesn't affect the final artifact.

Update default Dockerfile to use ubi8.

Author: kleesc

Dockerfile.centos Dockerfile

@@ -1,21 +1,15 @@
 # syntax=docker/dockerfile:1.2
 # Stream swaps to CentOS Stream once and is reused.
-FROM docker.io/library/centos:8 AS stream
+# FROM quay.io/centos/centos:stream8 AS stream
+FROM registry.access.redhat.com/ubi8/ubi:latest as base
 RUN set -ex\
-	; dnf -y -q install centos-release-stream \
-	; dnf -y -q swap centos-{linux,stream}-repos \
-# This "|| true" is needed if building in podman, it seems.
-# The filesystem package tries to modify permissions on /proc.
-	; dnf -y -q distro-sync || true \
-	; dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled powertools \
 	; dnf install -y gpgme-devel \
 	; dnf -y -q clean all
 
-RUN yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False git perl wget make gcc
+RUN dnf install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False git perl wget make gcc
 
 
-FROM stream AS build
-LABEL maintainer "Quay devel<[email protected]>"
+FROM base AS build
 
 ARG BUILDER_SRC
 
@@ -34,7 +28,7 @@ COPY . /go/src/${BUILDER_SRC}
 RUN cd /go/src/${BUILDER_SRC} && go mod vendor && make build
 
 
-FROM stream AS final
+FROM base AS final
 LABEL maintainer "Quay devel<[email protected]>"
 
 ARG BUILDER_SRC

buildctx/context.go

@@ -101,10 +101,11 @@ func (bc *Context) Pull() error {
 // Cache calls an RPC to the BuildManager to find the best tag to pull for
 // caching and then "docker pull"s it.
 func (bc *Context) Cache() error {
-	if err := bc.client.SetPhase(rpc.CheckingCache, nil); err != nil {
-		log.Errorf("failed to update phase to `checking-cache`")
-		return err
-	}
+	// Attempts to update the phase to checking cache.
+	// We don't handle the error here, as we currently consider the rpc.CheckingCache phase pulling,
+	// SetPhase will return an rpc.ErrClientRejectedPhaseTransition, since the phase will not change
+	// from the previous one (rpc.CheckingCache).
+	bc.client.SetPhase(rpc.CheckingCache, nil)
 
 	// Attempt to calculate the optimal tag. If we cannot find a tag, then caching is simply
 	// skipped.
@@ -116,10 +117,7 @@ func (bc *Context) Cache() error {
 
 	// Conduct a pull of the existing tag (if any). This will prime the cache.
 	if bc.args.PullToken != "" && cachedTag != "" {
-		if err := bc.client.SetPhase(rpc.PrimingCache, nil); err != nil {
-			log.Errorf("failed to update phase to `priming-cache`")
-			return err
-		}
+		bc.client.SetPhase(rpc.PrimingCache, nil)
 
 		err = primeCache(bc.writer, bc.containerClient, bc.args, cachedTag)
 		if err != nil {

rpc/grpcbuild/grpcbuild.go

@@ -170,6 +170,9 @@ func (c *grpcClient) PublishBuildLogEntry(entry string) error {
 			LogMessage:     entry,
 		},
 	)
+	if err == io.EOF {
+		return nil
+	}
 	if err != nil {
 		log.Warningf("failed to get log message: %s", err)
 		c.logSequenceNum -= 1