public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

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

* fix: Docker build for issue 1837

* fix: Linting
This commit is contained in:
Gabriel Nützi 2022-05-17 20:21:57 +02:00 committed by GitHub
parent 7b50fc8a57
commit 28432d3c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration/dockerfiles/Dockerfile_test_issue_1837
View File

@ -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 # Install ping
RUN yum --disableplugin=subscription-manager install -y iputils RUN yum --disableplugin=subscription-manager install -y iputils
RUN setcap cap_net_raw+ep /bin/ping || exit 1
FROM BASE FROM base
RUN set -e && [ ! -z "$(getcap /bin/ping)" ] || exit 1 RUN [ ! -z "$(getcap /bin/ping)" ] || exit 1

2
pkg/executor/build.go
View File

@ -420,7 +420,7 @@ func (s *stageBuilder) build() error {
logrus.Debugf("build: cache key for command %v %v", command.String(), ck) logrus.Debugf("build: cache key for command %v %v", command.String(), ck)
// Push layer to cache (in parallel) now along with new config file // 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 { cacheGroup.Go(func() error {
return s.pushLayerToCache(s.opts, ck, tarPath, command.String()) return s.pushLayerToCache(s.opts, ck, tarPath, command.String())
}) })