158657b3 by Adam Heath

Re-order some bits, to be alphabetical.

1 parent 48d0fd84
...@@ -14,6 +14,10 @@ FROM scratch AS helmfile-remote ...@@ -14,6 +14,10 @@ FROM scratch AS helmfile-remote
14 ARG HELMFILE_VERSION=0.149.0 14 ARG HELMFILE_VERSION=0.149.0
15 ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz /srv/helmfile_linux_amd64.tar.gz 15 ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz /srv/helmfile_linux_amd64.tar.gz
16 16
17 FROM scratch AS istioctl-remote
18 ARG ISTIOCTL_VERSION=1.15.0
19 ADD https://github.com/istio/istio/releases/download/${ISTIOCTL_VERSION}/istio-${ISTIOCTL_VERSION}-linux-amd64.tar.gz /srv/istioctl-linux-amd64.tar.gz
20
17 FROM scratch AS kubectl-remote 21 FROM scratch AS kubectl-remote
18 ARG KUBECTL_VERSION=1.24.1 22 ARG KUBECTL_VERSION=1.24.1
19 ADD https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl /srv/kubectl 23 ADD https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl /srv/kubectl
...@@ -23,10 +27,6 @@ ARG KUSTOMIZE_VERSION=3.8.10 ...@@ -23,10 +27,6 @@ ARG KUSTOMIZE_VERSION=3.8.10
23 #ARG KUSTOMIZE_VERSION=5.5.0 27 #ARG KUSTOMIZE_VERSION=5.5.0
24 ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz /srv/kustomize_linux_amd64.tar.gz 28 ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz /srv/kustomize_linux_amd64.tar.gz
25 29
26 FROM scratch AS istioctl-remote
27 ARG ISTIOCTL_VERSION=1.15.0
28 ADD https://github.com/istio/istio/releases/download/${ISTIOCTL_VERSION}/istio-${ISTIOCTL_VERSION}-linux-amd64.tar.gz /srv/istioctl-linux-amd64.tar.gz
29
30 FROM scratch AS skopeo-remote 30 FROM scratch AS skopeo-remote
31 ARG SKOPEO_VERSION=1.15.0 31 ARG SKOPEO_VERSION=1.15.0
32 ADD https://github.com/containers/skopeo/archive/refs/tags/v${SKOPEO_VERSION}.tar.gz /srv/skopeo.tar.gz 32 ADD https://github.com/containers/skopeo/archive/refs/tags/v${SKOPEO_VERSION}.tar.gz /srv/skopeo.tar.gz
...@@ -69,9 +69,9 @@ COPY --from=helm-remote /srv/helm-linux-amd64.tar.gz /srv/helm-linux-amd64.tar.g ...@@ -69,9 +69,9 @@ COPY --from=helm-remote /srv/helm-linux-amd64.tar.gz /srv/helm-linux-amd64.tar.g
69 COPY --from=helm-diff-remote /srv/helm-diff-linux-amd64.tgz /srv/helm-diff-linux-amd64.tgz 69 COPY --from=helm-diff-remote /srv/helm-diff-linux-amd64.tgz /srv/helm-diff-linux-amd64.tgz
70 COPY --from=helm-git-remote /srv/helm-git.tar.gz /srv/helm-git.tar.gz 70 COPY --from=helm-git-remote /srv/helm-git.tar.gz /srv/helm-git.tar.gz
71 COPY --from=helmfile-remote /srv/helmfile_linux_amd64.tar.gz /srv/helmfile_linux_amd64.tar.gz 71 COPY --from=helmfile-remote /srv/helmfile_linux_amd64.tar.gz /srv/helmfile_linux_amd64.tar.gz
72 COPY --from=istioctl-remote /srv/istioctl-linux-amd64.tar.gz /srv/istioctl-linux-amd64.tar.gz
72 COPY --from=kubectl-remote /srv/kubectl /usr/local/bin/kubectl 73 COPY --from=kubectl-remote /srv/kubectl /usr/local/bin/kubectl
73 COPY --from=kustomize-remote /srv/kustomize_linux_amd64.tar.gz /srv/kustomize_linux_amd64.tar.gz 74 COPY --from=kustomize-remote /srv/kustomize_linux_amd64.tar.gz /srv/kustomize_linux_amd64.tar.gz
74 COPY --from=istioctl-remote /srv/istioctl-linux-amd64.tar.gz /srv/istioctl-linux-amd64.tar.gz
75 75
76 # requires: libgpgme11 libsubid4 libdevmapper1.02.1 76 # requires: libgpgme11 libsubid4 libdevmapper1.02.1
77 COPY --from=skopeo-compiled /usr/local/bin/skopeo /usr/local/bin/skopeo 77 COPY --from=skopeo-compiled /usr/local/bin/skopeo /usr/local/bin/skopeo
......