Build multi-arch images by default
This commit is contained in:
parent
0f20548386
commit
d250b97b43
18 changed files with 226 additions and 206 deletions
|
|
@ -12,10 +12,9 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:227f97465158f038b3c0a3bfd8299fe8d8a530e3
|
||||
FROM golang:1.14.3-alpine3.11 as GO
|
||||
|
||||
ARG GOLANG_VERSION
|
||||
ARG GOLANG_SHA
|
||||
FROM quay.io/kubernetes-ingress-controller/nginx:e3c49c52f4b74fe47ad65d6f3266a02e8b6b622f
|
||||
|
||||
ARG RESTY_CLI_VERSION
|
||||
ARG RESTY_CLI_SHA
|
||||
|
|
@ -24,13 +23,10 @@ ARG K8S_RELEASE
|
|||
ARG ETCD_VERSION
|
||||
ARG CHART_TESTING_VERSION
|
||||
|
||||
ENV GOPATH /go
|
||||
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
|
||||
|
||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
|
||||
|
||||
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
|
||||
|
||||
COPY --from=GO /usr/local/go /usr/local/go
|
||||
|
||||
RUN apk add --no-cache \
|
||||
bash \
|
||||
ca-certificates \
|
||||
|
|
@ -43,84 +39,75 @@ RUN apk add --no-cache \
|
|||
python \
|
||||
py-crcmod \
|
||||
py-pip \
|
||||
unzip \
|
||||
openssl
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache --virtual .build-deps \
|
||||
g++ \
|
||||
pkgconfig \
|
||||
openssl \
|
||||
unzip \
|
||||
go \
|
||||
; \
|
||||
export \
|
||||
# set GOROOT_BOOTSTRAP such that we can actually build Go
|
||||
GOROOT_BOOTSTRAP="$(go env GOROOT)" \
|
||||
# ... and set "cross-building" related vars to the installed system's values so that we create a build targeting the proper arch
|
||||
# (for example, if our build host is GOARCH=amd64, but our build env/image is GOARCH=386, our build needs GOARCH=386)
|
||||
GOOS="$(go env GOOS)" \
|
||||
GOARCH="$(go env GOARCH)" \
|
||||
GOHOSTOS="$(go env GOHOSTOS)" \
|
||||
GOHOSTARCH="$(go env GOHOSTARCH)" \
|
||||
; \
|
||||
# also explicitly set GO386 and GOARM if appropriate
|
||||
# https://github.com/docker-library/golang/issues/184
|
||||
apkArch="$(apk --print-arch)"; \
|
||||
case "$apkArch" in \
|
||||
armhf) export GOARM='6' ;; \
|
||||
armv7) export GOARM='7' ;; \
|
||||
x86) export GO386='387' ;; \
|
||||
esac; \
|
||||
\
|
||||
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
|
||||
echo "$GOLANG_SHA *go.tgz" | sha256sum -c -; \
|
||||
tar -C /usr/local -xzf go.tgz; \
|
||||
rm go.tgz; \
|
||||
\
|
||||
cd /usr/local/go/src; \
|
||||
./make.bash; \
|
||||
\
|
||||
rm -rf \
|
||||
# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
|
||||
/usr/local/go/pkg/bootstrap \
|
||||
# https://golang.org/cl/82095
|
||||
# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
|
||||
/usr/local/go/pkg/obj \
|
||||
; \
|
||||
\
|
||||
export PATH="/usr/local/go/bin:$PATH"; \
|
||||
go version \
|
||||
; \
|
||||
url="https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz"; \
|
||||
wget -O resty_cli.tgz "$url"; \
|
||||
echo "${RESTY_CLI_SHA} *resty_cli.tgz" | sha256sum -c -; \
|
||||
tar -C /tmp -xzf resty_cli.tgz; \
|
||||
rm resty_cli.tgz; \
|
||||
mv /tmp/resty-cli-${RESTY_CLI_VERSION}/bin/* /usr/local/bin/; \
|
||||
resty -V \
|
||||
; \
|
||||
luarocks install luacheck; \
|
||||
luarocks install busted \
|
||||
; \
|
||||
go get github.com/onsi/ginkgo/ginkgo; \
|
||||
go get golang.org/x/lint/golint \
|
||||
; \
|
||||
apk del .build-deps;
|
||||
ENV GOPATH /go
|
||||
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
|
||||
|
||||
RUN wget https://raw.githubusercontent.com/openresty/openresty-devel-utils/master/lj-releng -O /usr/local/bin/lj-releng \
|
||||
&& chmod +x /usr/local/bin/lj-releng
|
||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
|
||||
|
||||
RUN wget https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \
|
||||
RUN go get github.com/onsi/ginkgo/ginkgo golang.org/x/lint/golint
|
||||
|
||||
RUN wget -O /tmp/resty_cli.tgz https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz \
|
||||
&& echo "${RESTY_CLI_SHA} */tmp/resty_cli.tgz" | sha256sum -c - \
|
||||
&& tar -C /tmp -xzf /tmp/resty_cli.tgz \
|
||||
&& mv /tmp/resty-cli-${RESTY_CLI_VERSION}/bin/* /usr/local/bin/ \
|
||||
&& resty -V \
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
ARG LUA_CHECK_VERSION
|
||||
ARG LUA_CHECK_SHA
|
||||
|
||||
RUN wget -O /tmp/luarocks.tgz https://github.com/luarocks/luarocks/archive/v3.3.1.tar.gz \
|
||||
&& tar -C /tmp -xzf /tmp/luarocks.tgz \
|
||||
&& cd /tmp/luarocks* \
|
||||
&& ./configure \
|
||||
&& make install
|
||||
|
||||
RUN luarocks install busted \
|
||||
&& luarocks install luacheck
|
||||
|
||||
ARG BUSTED_VERSION
|
||||
ARG BUSTED_SHA
|
||||
|
||||
ARG TARGETARCH
|
||||
|
||||
RUN wget -O /usr/local/bin/kubectl \
|
||||
https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/${TARGETARCH}/kubectl \
|
||||
&& chmod +x /usr/local/bin/kubectl
|
||||
|
||||
RUN wget https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kube-apiserver -O /usr/local/bin/kube-apiserver \
|
||||
RUN wget -O /usr/local/bin/kube-apiserver \
|
||||
https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/${TARGETARCH}/kube-apiserver \
|
||||
&& chmod +x /usr/local/bin/kube-apiserver
|
||||
|
||||
RUN wget https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -O /tmp/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
|
||||
RUN wget -O /tmp/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz \
|
||||
https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz \
|
||||
&& mkdir -p /tmp/etcd-download \
|
||||
&& tar xzvf /tmp/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -C /tmp/etcd-download --strip-components=1 \
|
||||
&& tar xzvf /tmp/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz -C /tmp/etcd-download --strip-components=1 \
|
||||
&& cp /tmp/etcd-download/etcd /usr/local/bin \
|
||||
&& rm -rf /tmp/etcd-download
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
RUN wget -O /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \
|
||||
https://github.com/helm/chart-testing/releases/download/v${CHART_TESTING_VERSION}/chart-testing_${CHART_TESTING_VERSION}_linux_amd64.tar.gz \
|
||||
&& mkdir -p /tmp/ct-download \
|
||||
&& tar xzvf /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz -C /tmp/ct-download \
|
||||
&& rm /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \
|
||||
&& cp /tmp/ct-download/ct /usr/local/bin \
|
||||
&& mkdir -p /etc/ct \
|
||||
&& cp -R /tmp/ct-download/etc/* /etc/ct \
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
ARG HELM_VERSION
|
||||
|
||||
RUN wget -O /tmp/helm.tgz https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \
|
||||
&& tar -C /tmp -xzf /tmp/helm.tgz \
|
||||
&& cp /tmp/linux*/helm /usr/local/bin \
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
RUN curl -sSL -o /usr/local/bin/cfssl https://github.com/cloudflare/cfssl/releases/download/v1.4.1/cfssl_1.4.1_linux_${TARGETARCH} \
|
||||
&& curl -sSL -o /usr/local/bin/cfssljson https://github.com/cloudflare/cfssl/releases/download/v1.4.1/cfssljson_1.4.1_linux_${TARGETARCH} \
|
||||
&& chmod +x /usr/local/bin/cfssl*
|
||||
|
||||
# Install a YAML Linter
|
||||
ARG YAML_LINT_VERSION
|
||||
|
|
@ -130,19 +117,4 @@ RUN pip install "yamllint==$YAML_LINT_VERSION"
|
|||
ARG YAMALE_VERSION
|
||||
RUN pip install "yamale==$YAMALE_VERSION"
|
||||
|
||||
RUN wget https://github.com/helm/chart-testing/releases/download/v${CHART_TESTING_VERSION}/chart-testing_${CHART_TESTING_VERSION}_linux_amd64.tar.gz \
|
||||
-O /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \
|
||||
&& mkdir -p /tmp/ct-download \
|
||||
&& tar xzvf /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz -C /tmp/ct-download \
|
||||
&& cp /tmp/ct-download/ct /usr/local/bin \
|
||||
&& mkdir -p /etc/ct \
|
||||
&& cp -R /tmp/ct-download/etc/* /etc/ct \
|
||||
&& rm -rf /tmp/ct-download
|
||||
|
||||
RUN curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
|
||||
|
||||
RUN curl -sSL -o /usr/local/bin/cfssl https://github.com/cloudflare/cfssl/releases/download/v1.4.1/cfssl_1.4.1_linux_amd64 \
|
||||
&& curl -sSL -o /usr/local/bin/cfssljson https://github.com/cloudflare/cfssl/releases/download/v1.4.1/cfssljson_1.4.1_linux_amd64 \
|
||||
&& chmod +x /usr/local/bin/cfssl*
|
||||
|
||||
WORKDIR $GOPATH
|
||||
|
|
|
|||
|
|
@ -17,25 +17,24 @@ REGISTRY ?= quay.io/kubernetes-ingress-controller
|
|||
|
||||
IMAGE = $(REGISTRY)/e2e
|
||||
|
||||
all: docker-build docker-push
|
||||
PLATFORM ?= amd64
|
||||
|
||||
docker-build:
|
||||
.PHONY: image
|
||||
image:
|
||||
docker buildx build \
|
||||
--pull \
|
||||
--load \
|
||||
--progress plain \
|
||||
--platform $(PLATFORM) \
|
||||
--build-arg K8S_RELEASE=v1.15.7 \
|
||||
--build-arg ETCD_VERSION=v3.3.18 \
|
||||
--build-arg GOLANG_VERSION=1.14.3 \
|
||||
--build-arg GOLANG_SHA=93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56 \
|
||||
--build-arg RESTY_CLI_VERSION=0.25rc2 \
|
||||
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
|
||||
--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \
|
||||
--build-arg YAML_LINT_VERSION=1.13.0 \
|
||||
--build-arg YAMALE_VERSION=1.8.0 \
|
||||
--build-arg LUA_CHECK_VERSION=0.23.0 \
|
||||
--build-arg LUA_CHECK_SHA=b4edf3a7702519502696d4ac7372ed1bd6a82ded63bf81f2b1d7e9b37711be2b \
|
||||
--build-arg BUSTED_VERSION=v2.0.rc13-0 \
|
||||
--build-arg BUSTED_SHA=74ef88ae04545d78b4922e459c1cd459fb5a0356b73a061549d2e4601b5de254 \
|
||||
--build-arg HELM_VERSION=v3.2.0 \
|
||||
-t $(IMAGE):$(TAG) .
|
||||
|
||||
docker-push:
|
||||
docker push $(IMAGE):$(TAG)
|
||||
docker tag $(IMAGE):$(TAG) $(IMAGE):latest
|
||||
docker push $(IMAGE):latest
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue