mirror of
https://github.com/GoogleContainerTools/kaniko
synced 2026-10-05 01:56:51 +02:00
In v1.8.0 (commit 7410007) kaniko switched to using the pax tar header
format for compressing image layers, since this format allows for greater
precision in recording timestamps, however this inadvertendly broke the
"--reproducible" functionality, due to an bug in the underlying
go-containerregistry dependency which did not set the additional
timestamps in the pax header when canonicalizing image layers. This
oversight has since been fixed in the dependency.
This commit bumps the google/go-containerregistry dependency to the
first commit which has fixed the bug
(v0.13.1-0.20230201183932-824efc7772b0). It also bumps the version of
cloud.google.com/go/storage to v1.29.0 to be compatible with the higher
transitive dependency.
117 lines
3.5 KiB
Go
117 lines
3.5 KiB
Go
// Copyright 2022 Google LLC All Rights Reserved.
|
|
//
|
|
// Licensed 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.
|
|
|
|
// Package zstd provides helper functions for interacting with zstd streams.
|
|
package zstd
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"io"
|
|
|
|
"github.com/google/go-containerregistry/internal/and"
|
|
"github.com/klauspost/compress/zstd"
|
|
)
|
|
|
|
// MagicHeader is the start of zstd files.
|
|
var MagicHeader = []byte{'\x28', '\xb5', '\x2f', '\xfd'}
|
|
|
|
// ReadCloser reads uncompressed input data from the io.ReadCloser and
|
|
// returns an io.ReadCloser from which compressed data may be read.
|
|
// This uses zstd level 1 for the compression.
|
|
func ReadCloser(r io.ReadCloser) io.ReadCloser {
|
|
return ReadCloserLevel(r, 1)
|
|
}
|
|
|
|
// ReadCloserLevel reads uncompressed input data from the io.ReadCloser and
|
|
// returns an io.ReadCloser from which compressed data may be read.
|
|
func ReadCloserLevel(r io.ReadCloser, level int) io.ReadCloser {
|
|
pr, pw := io.Pipe()
|
|
|
|
// For highly compressible layers, zstd.Writer will output a very small
|
|
// number of bytes per Write(). This is normally fine, but when pushing
|
|
// to a registry, we want to ensure that we're taking full advantage of
|
|
// the available bandwidth instead of sending tons of tiny writes over
|
|
// the wire.
|
|
// 64K ought to be small enough for anybody.
|
|
bw := bufio.NewWriterSize(pw, 2<<16)
|
|
|
|
// Returns err so we can pw.CloseWithError(err)
|
|
go func() error {
|
|
// TODO(go1.14): Just defer {pw,zw,r}.Close like you'd expect.
|
|
// Context: https://golang.org/issue/24283
|
|
zw, err := zstd.NewWriter(bw, zstd.WithEncoderLevel(zstd.EncoderLevelFromZstd(level)))
|
|
if err != nil {
|
|
return pw.CloseWithError(err)
|
|
}
|
|
|
|
if _, err := io.Copy(zw, r); err != nil {
|
|
defer r.Close()
|
|
defer zw.Close()
|
|
return pw.CloseWithError(err)
|
|
}
|
|
|
|
// Close zstd writer to Flush it and write zstd trailers.
|
|
if err := zw.Close(); err != nil {
|
|
return pw.CloseWithError(err)
|
|
}
|
|
|
|
// Flush bufio writer to ensure we write out everything.
|
|
if err := bw.Flush(); err != nil {
|
|
return pw.CloseWithError(err)
|
|
}
|
|
|
|
// We don't really care if these fail.
|
|
defer pw.Close()
|
|
defer r.Close()
|
|
|
|
return nil
|
|
}()
|
|
|
|
return pr
|
|
}
|
|
|
|
// UnzipReadCloser reads compressed input data from the io.ReadCloser and
|
|
// returns an io.ReadCloser from which uncompressed data may be read.
|
|
func UnzipReadCloser(r io.ReadCloser) (io.ReadCloser, error) {
|
|
gr, err := zstd.NewReader(r)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &and.ReadCloser{
|
|
Reader: gr,
|
|
CloseFunc: func() error {
|
|
// If the unzip fails, then this seems to return the same
|
|
// error as the read. We don't want this to interfere with
|
|
// us closing the main ReadCloser, since this could leave
|
|
// an open file descriptor (fails on Windows).
|
|
gr.Close()
|
|
return r.Close()
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
// Is detects whether the input stream is compressed.
|
|
func Is(r io.Reader) (bool, error) {
|
|
magicHeader := make([]byte, 4)
|
|
n, err := r.Read(magicHeader)
|
|
if n == 0 && err == io.EOF {
|
|
return false, nil
|
|
}
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return bytes.Equal(magicHeader, MagicHeader), nil
|
|
}
|