mirror of
https://git.vectorsigma.ru/public/k3s.git
synced 2026-08-08 22:32:10 +00:00
7ea6f13154
* netpol: Add dual-stack support This change allows to define two cluster CIDRs for compatibility with Kubernetes dual-stuck, with an assumption that two CIDRs are usually IPv4 and IPv6. It does that by levearaging changes in out kube-router fork, with the following downstream release: https://github.com/k3s-io/kube-router/releases/tag/v1.3.2%2Bk3s Signed-off-by: Michal Rostecki <vadorovsky@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * Add s390x arch support for k3s (#5018) * Update docs to include s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x drone pipeline Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Install trivy linux arch only for amd64 This is done so that trivy is not installed for s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x arch if condition for Dockerfile.test Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x arch in install script Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add s390x GOARCH in build script Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Add SUFFIX s390x in scripts Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Skip image scan for s390x arch Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update klipper-lb to version v0.3.5 Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update traefik version to v2.6.2 Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Update registry to v2.8.1 in tests which supports s390x Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> * Skip compact tests for s390x arch This is done because compact test require a previous k3s version which supports s390x and it is not available Signed-off-by: Venkata Krishna Rohit Sakala <rohitsakala@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com> * Increase k3s-root version to v0.10.0 which includes s390x support Signed-off-by: Derek Nola <derek.nola@suse.com> Co-authored-by: Michal Rostecki <vadorovsky@gmail.com> Co-authored-by: Sakala Venkata Krishna Rohit <rohitsakala@gmail.com>
54 lines
2.8 KiB
Docker
54 lines
2.8 KiB
Docker
ARG GOLANG=golang:1.16.10-alpine3.13
|
|
FROM ${GOLANG}
|
|
|
|
ARG http_proxy=$http_proxy
|
|
ARG https_proxy=$https_proxy
|
|
ARG no_proxy=$no_proxy
|
|
ENV http_proxy=$http_proxy
|
|
ENV https_proxy=$https_proxy
|
|
ENV no_proxy=$no_proxy
|
|
|
|
RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \
|
|
zlib-dev tar zip squashfs-tools npm coreutils python3 openssl-dev libffi-dev libseccomp libseccomp-dev \
|
|
libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static \
|
|
zstd gzip alpine-sdk binutils-gold gawk
|
|
RUN if [ "$(go env GOARCH)" = "arm64" ]; then \
|
|
wget https://github.com/aquasecurity/trivy/releases/download/v0.25.3/trivy_0.25.3_Linux-ARM64.tar.gz && \
|
|
tar -zxvf trivy_0.25.3_Linux-ARM64.tar.gz && \
|
|
mv trivy /usr/local/bin; \
|
|
elif [ "$(go env GOARCH)" = "arm" ]; then \
|
|
wget https://github.com/aquasecurity/trivy/releases/download/v0.25.3/trivy_0.25.3_Linux-ARM.tar.gz && \
|
|
tar -zxvf trivy_0.25.3_Linux-ARM.tar.gz && \
|
|
mv trivy /usr/local/bin; \
|
|
elif [ "$(go env GOARCH)" = "amd64" ]; then \
|
|
wget https://github.com/aquasecurity/trivy/releases/download/v0.25.3/trivy_0.25.3_Linux-64bit.tar.gz && \
|
|
tar -zxvf trivy_0.25.3_Linux-64bit.tar.gz && \
|
|
mv trivy /usr/local/bin; \
|
|
fi
|
|
# this works for both go 1.15 and 1.16
|
|
RUN GOPROXY=direct go get golang.org/x/tools/cmd/goimports@gopls/v0.7.0
|
|
RUN rm -rf /go/src /go/pkg
|
|
|
|
RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
|
|
curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.1; \
|
|
fi
|
|
|
|
ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.6.2/yq_linux
|
|
RUN wget -O - ${YQ_URL}_$(go env GOARCH) > /usr/bin/yq && chmod +x /usr/bin/yq
|
|
|
|
ARG SELINUX=true
|
|
ENV SELINUX $SELINUX
|
|
|
|
ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy
|
|
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG
|
|
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
|
|
ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./pkg/static ./pkg/deploy ./build/static
|
|
ENV DAPPER_DOCKER_SOCKET true
|
|
ENV HOME ${DAPPER_SOURCE}
|
|
ENV CROSS true
|
|
ENV STATIC_BUILD true
|
|
WORKDIR ${DAPPER_SOURCE}
|
|
|
|
ENTRYPOINT ["./scripts/entry.sh"]
|
|
CMD ["ci"]
|