Update linuxkit/alpine

Signed-off-by: Avi Deitcher <avi@deitcher.net>
linuxkit · Dec 29, 2022 · 7f8d0a6 · 7f8d0a6
1 parent 154f943
commit 7f8d0a6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc
@@ -18,7 +18,6 @@ RUN apk update && apk upgrade -a && \
   curl \
   elfutils-dev \
   flex-dev \
-  fts-dev \
   gettext-dev \
   git \
   iperf3 \
@@ -29,6 +28,7 @@ RUN apk update && apk upgrade -a && \
   llvm-static \
   luajit-dev \
   m4 \
+  musl-fts-dev \
   python3 \
   zlib-dev \
   && true

diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile
@@ -9,7 +9,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS mirror2
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
-    busybox-initscripts
+    acpid
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
 FROM scratch

diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14 AS mirror
+FROM alpine:3.17 AS mirror
 
 # update base image
 RUN apk update && apk upgrade -a
@@ -32,9 +32,8 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" >
 COPY go-compile.sh /go/bin/
 RUN apk add --no-cache git go musl-dev
 ENV GOPATH=/go PATH=$PATH:/go/bin
-RUN go get -u golang.org/x/lint/golint
-RUN go get -u github.com/gordonklaus/ineffassign
-RUN go get -u github.com/LK4D4/vndr
+RUN go install golang.org/x/lint/golint@latest
+RUN go install github.com/gordonklaus/ineffassign@latest
 
 # Checkout and compile iucode-tool for Intel CPU microcode
 # On non-x86_64 create a dummy file to copy below.
@@ -56,7 +55,7 @@ RUN set -e && \
         cp iucode_tool /iucode_tool; \
     fi
 
-FROM alpine:3.14
+FROM alpine:3.17
 
 ARG TARGETARCH
 

diff --git a/tools/alpine/go-compile.sh b/tools/alpine/go-compile.sh
@@ -18,16 +18,16 @@ cd "$dir"
 
 # lint before building
 >&2 echo "gofmt..."
-test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)
+test -z "$(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)"
 
 >&2 echo "govet..."
-test -z $(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr)
+test -z "$(GOOS=linux go vet -printf=false . 2>&1 | grep -v "^#" | grep -v vendor/ | tee /dev/stderr)"
 
 >&2 echo "golint..."
-test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr)
+test -z "$(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec golint {} \; | tee /dev/stderr)"
 
 >&2 echo "ineffassign..."
-test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec ineffassign {} \; | tee /dev/stderr)
+test -z "$(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*" -exec ineffassign {} \; | tee /dev/stderr)"
 
 >&2 echo "go test..."
 go test

diff --git a/tools/alpine/packages b/tools/alpine/packages
@@ -1,4 +1,5 @@
 abuild
+acpid
 alpine-baselayout
 alpine-keys
 apk-tools
@@ -18,7 +19,6 @@ bsd-compat-headers
 btrfs-progs
 btrfs-progs-dev
 build-base
-busybox-initscripts
 ca-certificates
 cdrkit
 cifs-utils
@@ -42,7 +42,6 @@ expect
 findutils
 flex
 flex-dev
-fts-dev
 gcc
 gettext
 gettext-dev
@@ -84,6 +83,7 @@ mpfr-dev
 mtools
 multipath-tools
 musl-dev
+musl-fts-dev
 ncurses-dev
 nfs-utils
 open-iscsi
@@ -96,7 +96,6 @@ openssl
 openssl-dev
 patch
 pigz
-python2
 python3
 qemu-aarch64
 qemu-arm