diff --git a/Dockerfile b/Dockerfile index 328ebf8fe01a111e61bb97ddbb96c2703cbe14a6..78389c789281d956629b9099d41a1735fd30ea43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,9 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS builder COPY kubernetes.tar.gz / -#install Go 1.15.8 -COPY go1.15.8.linux-amd64.tar.gz / -RUN tar -C /usr/local -xzf go1.15.8.linux-amd64.tar.gz +#install Golang +COPY golang.tar.gz / +RUN tar -C /usr/local -xzf golang.tar.gz ENV PATH="$PATH:/usr/local/go/bin" RUN dnf upgrade -y && \ @@ -26,16 +26,16 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} COPY --from=builder /src/k8s.io/kubernetes/_output/bin/kubeadm /opt/bin/ -COPY cni-plugins-linux-amd64-v0.9.1.tgz crictl-v1.20.0-linux-amd64.tar.gz / +COPY cni-plugins-linux-amd64.tgz crictl-linux-amd64.tar.gz / RUN dnf upgrade -y && \ dnf clean all && \ rm -rf /var/cache/dnf && \ chmod +x /opt/bin/kubeadm && \ mkdir -p /opt/cni/bin && \ - tar xzf cni-plugins-linux-amd64-v0.9.1.tgz -C /opt/cni/bin && \ - rm -f cni-cni-plugins-linux-amd64-v0.9.1.tgz && \ + tar xzf cni-plugins-linux-amd64.tgz -C /opt/cni/bin && \ + rm -f cni-cni-plugins-linux-amd64.tgz && \ mkdir -p /opt/bin && \ - tar xzf crictl-v1.20.0-linux-amd64.tar.gz -C /opt/bin && \ - rm -rf crictl-v1.20.0-linux-amd64.tar.gz + tar xzf crictl-linux-amd64.tar.gz -C /opt/bin && \ + rm -rf crictl-linux-amd64.tar.gz ENTRYPOINT ["/opt/bin/kubeadm"] diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e4e072b1c7e168bb2f50b503d0e68128f63c0531..91ce8374dca440072f0e61b8e49f166bdfc6fa72 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -42,18 +42,18 @@ resources: validation: type: sha256 value: 53ef7fde3ef2f8463eb6f2175fdfe5666f1577dcbed0af82472cfc2bb48dd93c -- filename: go1.15.8.linux-amd64.tar.gz - url: https://golang.org/dl/go1.15.8.linux-amd64.tar.gz +- filename: golang.tar.gz + url: https://golang.org/dl/go1.16.7.linux-amd64.tar.gz validation: type: sha256 - value: d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b -- filename: crictl-v1.20.0-linux-amd64.tar.gz + value: 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 +- filename: crictl-linux-amd64.tar.gz url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.22.0/crictl-v1.22.0-linux-amd64.tar.gz validation: type: sha256 value: 45e0556c42616af60ebe93bf4691056338b3ea0001c0201a6a8ff8b1dbc0652a - url: https://github.com/containernetworking/plugins/releases/download/v1.0.0/cni-plugins-linux-amd64-v1.0.0.tgz - filename: cni-plugins-linux-amd64-v0.9.1.tgz + filename: cni-plugins-linux-amd64.tgz validation: type: sha256 value: 5894883eebe3e38f4474810d334b00dc5ec59bd01332d1f92ca4eb142a67d2e8