Skip to content

Update buster version to 1.9.0 #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2021
Merged

Update buster version to 1.9.0 #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9754e9
Update buster version to 1.9.0
mattcary Sep 20, 2021
85f0cfa
Update gofmt
mattcary Sep 20, 2021
a6aa91a
Robust handling of /usr/sbin/rm in Dockerfile
mattcary Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ ADD . .
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver

# MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0 as mad-hack
RUN ln -s /bin/rm /usr/sbin/rm \
FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as mad-hack
RUN ln -fs /bin/rm /usr/sbin/rm \
&& clean-install udev

# Start from Kubernetes Debian base
FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0
FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
# Install necessary dependencies
RUN ln -s /bin/rm /usr/sbin/rm \
RUN ln -fs /bin/rm /usr/sbin/rm \
&& clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id

Expand Down
1 change: 1 addition & 0 deletions pkg/gce-pd-csi-driver/utils_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we need this line now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gofmt will complain if you don't have both the old and new styles of the build directives. ¯_(ツ)_/¯

// +build !windows

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/gce-pd-csi-driver/utils_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/mount-manager/safe-mounter-v1_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/mount-manager/safe-mounter-v1beta_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/mount-manager/safe-mounter_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/mount-manager/safe-mounter_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down
2 changes: 2 additions & 0 deletions pkg/mount-manager/statter_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
//go:build windows
// +build windows

/*
Copyright 2019 The Kubernetes Authors.

Expand Down
1 change: 1 addition & 0 deletions pkg/resizefs/resizefs_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/resizefs/resizefs_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build windows
// +build windows

/*
Expand Down