Skip to content

update linux base image to debian buster 1.5.0 #755

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 2 commits into from
Apr 21, 2021
Merged

update linux base image to debian buster 1.5.0 #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddd3458
update linux base image to debian buster 1.5.0
mattcary Apr 19, 2021
ef70769
Improve kustomize downloading
mattcary Apr 14, 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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ ADD . .
RUN make

# 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-amd64:v2.1.3 as base
FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.5.0 as mad-hack
RUN clean-install udev

# Start from Kubernetes Debian base
FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.5.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 clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
COPY --from=base /lib/udev/scsi_id /lib/udev_containerized/scsi_id
COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id

ENTRYPOINT ["/gce-pd-csi-driver"]
19 changes: 12 additions & 7 deletions deploy/kubernetes/install-kustomize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,26 @@ trap cleanup EXIT
pushd $tmpDir >& /dev/null

opsys=windows
arch=amd64
if [[ "$OSTYPE" == linux* ]]; then
opsys=linux_amd64
opsys=linux
elif [[ "$OSTYPE" == darwin* ]]; then
opsys=darwin
fi

curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases |\
grep browser_download |\
grep $opsys |\
# As github has a limit on what stored in releases/, and kustomize has many different package
# versions, we just point directly at the version we want. See
# github.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh.

version=v3.9.4
url_base=https://api.github.com/repos/kubernetes-sigs/kustomize/releases/tags/kustomize%2F
curl -s ${url_base}${version} |\
grep browser_download.*${opsys}_${arch} |\
cut -d '"' -f 4 |\
grep /kustomize/v3.9.4 |\
sort | tail -n 1 |\
sort -V | tail -n 1 |\
xargs curl -s -O -L

tar xzf ./kustomize_v*_${opsys}.tar.gz
tar xzf ./kustomize_v*_${opsys}_${arch}.tar.gz

cp ./kustomize $where

Expand Down