Skip to content

Commit

Permalink
update all dependencies (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 authored Dec 7, 2021
1 parent d1651a9 commit 91f1db3
Show file tree
Hide file tree
Showing 4 changed files with 301 additions and 187 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM metalstack/builder:latest as builder
FROM r.metal-stack.io/metal/supermicro:2.5.2 as sum

FROM golang:1.14-buster as initrd-builder
ENV UROOT_GIT_SHA_OR_TAG=v7.0.0
ENV UROOT_GIT_SHA_OR_TAG=v0.7.0
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
curl \
Expand All @@ -27,7 +27,7 @@ RUN mkdir -p ${GOPATH}/src/github.com/u-root \
&& git clone https://github.com/u-root/u-root \
&& cd u-root \
&& git checkout ${UROOT_GIT_SHA_OR_TAG} \
&& go install
&& GO111MODULE=off go install
WORKDIR /work
COPY lvmlocal.conf ice.pkg metal.key metal.key.pub passwd varrun Makefile .git /work/
COPY --from=sum /usr/bin/sum /work/
Expand Down
4 changes: 2 additions & 2 deletions cmd/image/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
pb "github.com/cheggaaa/pb/v3"
log "github.com/inconshreveable/log15"
"github.com/mholt/archiver"
lz4 "github.com/pierrec/lz4"
lz4 "github.com/pierrec/lz4/v4"

//nolint:gosec
"crypto/md5"
Expand Down Expand Up @@ -63,7 +63,7 @@ func Burn(prefix, image, source string) error {
}

lz4Reader := lz4.NewReader(file)
log.Info("lz4", "size", lz4Reader.Header.Size)
log.Info("lz4", "size", lz4Reader.Size())
creader := io.NopCloser(lz4Reader)
// wild guess for lz4 compression ratio
// lz4 is a stream format and therefore the
Expand Down
29 changes: 15 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,37 @@ require (
github.com/beevik/ntp v0.3.0
github.com/cheggaaa/pb/v3 v3.0.8
github.com/dsnet/compress v0.0.1 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/frankban/quicktest v1.13.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/frankban/quicktest v1.14.0 // indirect
github.com/go-openapi/errors v0.20.1
github.com/go-openapi/runtime v0.19.31
github.com/go-openapi/strfmt v0.20.2
github.com/go-openapi/runtime v0.21.0
github.com/go-openapi/strfmt v0.21.1
github.com/go-openapi/swag v0.19.15
github.com/go-openapi/validate v0.20.2
github.com/go-openapi/validate v0.20.3
github.com/google/gopacket v1.1.19
github.com/google/uuid v1.3.0
github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac
github.com/jaypipes/ghw v0.8.0
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/metal-stack/go-hal v0.3.6
github.com/metal-stack/go-lldpd v0.3.5
github.com/metal-stack/metal-api v0.15.6
github.com/metal-stack/metal-lib v0.8.0
github.com/metal-stack/go-lldpd v0.3.6
github.com/metal-stack/metal-api v0.16.1
github.com/metal-stack/metal-lib v0.9.0
github.com/metal-stack/v v1.0.3
// archiver must stay in version v2.1.0, see replace below
github.com/mholt/archiver v3.1.1+incompatible
github.com/nwaples/rardecode v1.1.2 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pierrec/lz4/v4 v4.1.12
github.com/stretchr/testify v1.7.0
github.com/tidwall/pretty v1.2.0 // indirect
github.com/u-root/u-root v7.0.0+incompatible
github.com/u-root/u-root v0.8.0
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf
google.golang.org/grpc v1.40.0
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d
google.golang.org/grpc v1.42.0
gopkg.in/yaml.v2 v2.4.0
)

Expand Down
Loading

0 comments on commit 91f1db3

Please sign in to comment.