fix(ci): Docker build for issue 1837 (GoogleContainerTools#2095)

* fix: Docker build for issue 1837 * fix: Linting
felixs8696 · May 17, 2022 · 28432d3 · 28432d3
1 parent 7b50fc8
commit 28432d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/integration/dockerfiles/Dockerfile_test_issue_1837 b/integration/dockerfiles/Dockerfile_test_issue_1837
@@ -1,6 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.2 AS BASE
+FROM registry.access.redhat.com/ubi8/ubi:8.2 AS base
 # Install ping
 RUN yum --disableplugin=subscription-manager install -y iputils
+RUN setcap cap_net_raw+ep /bin/ping || exit 1
 
-FROM BASE
-RUN set -e && [ ! -z "$(getcap /bin/ping)" ] || exit 1
+FROM base
+RUN [ ! -z "$(getcap /bin/ping)" ] || exit 1
diff --git a/pkg/executor/build.go b/pkg/executor/build.go
@@ -420,7 +420,7 @@ func (s *stageBuilder) build() error {
 				logrus.Debugf("build: cache key for command %v %v", command.String(), ck)
 
 				// Push layer to cache (in parallel) now along with new config file
-				if command.ShouldCacheOutput() && ! s.opts.NoPushCache {
+				if command.ShouldCacheOutput() && !s.opts.NoPushCache {
 					cacheGroup.Go(func() error {
 						return s.pushLayerToCache(s.opts, ck, tarPath, command.String())
 					})