Skip to content

Commit 99fb2a3

Browse files
aptalcadims
authored andcommitted
Rebase to alpine 3.22, install thin-provisioning-tools from main repo
It looks like thin-provisioning-tools was being installed from the edge repo 5 years ago, presumably because at the time the edge repo contained a newer version that was required. At this point the edge repo contains the same exact version as the 3.22 repo so there is no need to install from edge.
1 parent e748491 commit 99fb2a3

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

deploy/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
FROM registry.hub.docker.com/library/golang:1.24-alpine3.21 AS build
1+
FROM registry.hub.docker.com/library/golang:1.24-alpine3.22 AS build
22

33
# Install build depdencies for all supported arches
44
RUN apk --no-cache add bash build-base cmake device-mapper findutils git \
5-
libc6-compat linux-headers ndctl-dev pkgconfig python3 wget zfs && \
6-
apk --no-cache add thin-provisioning-tools --repository http://dl-3.alpinelinux.org/alpine/edge/main/ && \
5+
libc6-compat linux-headers ndctl-dev pkgconfig python3 thin-provisioning-tools wget zfs && \
76
echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \
87
rm -rf /var/cache/apk/*
98

@@ -50,11 +49,10 @@ RUN export GO_TAGS="libpfm,netgo"; \
5049
fi; \
5150
GO_FLAGS="-tags=$GO_TAGS" ./build/build.sh
5251

53-
FROM mirror.gcr.io/library/alpine:3.18
52+
FROM mirror.gcr.io/library/alpine:3.22
5453
MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com jimmidyson@gmail.com stclair@google.com
5554

56-
RUN apk --no-cache add libc6-compat device-mapper findutils ndctl zfs && \
57-
apk --no-cache add thin-provisioning-tools --repository http://dl-3.alpinelinux.org/alpine/edge/main/ && \
55+
RUN apk --no-cache add libc6-compat device-mapper findutils ndctl thin-provisioning-tools zfs && \
5856
echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \
5957
rm -rf /var/cache/apk/*
6058

0 commit comments

Comments
 (0)