update all container tags with date and sha, upgrade all containers (#9834)
Signed-off-by: James Strong <strong.james.e@gmail.com>
This commit is contained in:
James Strong
GitHub
parent
522683813a
commit
26d83d1b20
24 changed files with 90 additions and 68 deletions
|
|
@ -30,27 +30,52 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
|
|||
|
||||
# build with buildx
|
||||
PLATFORMS?=linux/amd64,linux/arm64
|
||||
OUTPUT=
|
||||
OUTPUT?=
|
||||
PROGRESS=plain
|
||||
|
||||
build: ensure-buildx
|
||||
docker buildx build \
|
||||
--platform=${PLATFORMS} $(OUTPUT) \
|
||||
--progress=$(PROGRESS) \
|
||||
image:
|
||||
echo "Building docker image ($(ARCH))..."
|
||||
docker build \
|
||||
${PLATFORM_FLAG} ${PLATFORM} \
|
||||
--no-cache \
|
||||
--pull \
|
||||
--build-arg BASE_IMAGE=$(NGINX_BASE_IMAGE) \
|
||||
--push \
|
||||
--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
|
||||
--build-arg GOLANG_VERSION=1.20.1 \
|
||||
--build-arg ETCD_VERSION=3.4.3-0 \
|
||||
--build-arg K8S_RELEASE=v1.24.2 \
|
||||
--build-arg K8S_RELEASE=v1.26.0 \
|
||||
--build-arg RESTY_CLI_VERSION=0.27 \
|
||||
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
|
||||
--build-arg LUAROCKS_VERSION=3.8.0 \
|
||||
--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
|
||||
--build-arg CHART_TESTING_VERSION=3.7.0 \
|
||||
--build-arg CHART_TESTING_VERSION=3.8.0 \
|
||||
--build-arg YAML_LINT_VERSION=1.27.1 \
|
||||
--build-arg YAMALE_VERSION=4.0.4 \
|
||||
--build-arg HELM_VERSION=v3.9.0 \
|
||||
-t $(IMAGE):$(TAG) rootfs
|
||||
--build-arg HELM_VERSION=3.11.2 \
|
||||
--build-arg GINKGO_VERSION=2.9.0 \
|
||||
--build-arg GOLINT_VERSION=latest \
|
||||
-t ${IMAGE}:${TAG} rootfs
|
||||
|
||||
build: ensure-buildx
|
||||
docker buildx build \
|
||||
--platform=${PLATFORMS} ${OUTPUT} \
|
||||
--progress=${PROGRESS} \
|
||||
--pull \
|
||||
--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
|
||||
--build-arg GOLANG_VERSION=1.20.1 \
|
||||
--build-arg ETCD_VERSION=3.4.3-0 \
|
||||
--build-arg K8S_RELEASE=v1.26.0 \
|
||||
--build-arg RESTY_CLI_VERSION=0.27 \
|
||||
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
|
||||
--build-arg LUAROCKS_VERSION=3.8.0 \
|
||||
--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
|
||||
--build-arg CHART_TESTING_VERSION=3.8.0 \
|
||||
--build-arg YAML_LINT_VERSION=1.27.1 \
|
||||
--build-arg YAMALE_VERSION=4.0.4 \
|
||||
--build-arg HELM_VERSION=3.11.2 \
|
||||
--build-arg GINKGO_VERSION=2.9.0 \
|
||||
--build-arg GOLINT_VERSION=latest \
|
||||
-t ${IMAGE}:${TAG} rootfs
|
||||
|
||||
# push the cross built image
|
||||
push: OUTPUT=--push
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ steps:
|
|||
entrypoint: bash
|
||||
env:
|
||||
- DOCKER_CLI_EXPERIMENTAL=enabled
|
||||
- TAG=$_GIT_TAG
|
||||
- BASE_REF=$_PULL_BASE_REF
|
||||
- REGISTRY=gcr.io/k8s-staging-ingress-nginx
|
||||
# default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
|
||||
|
|
@ -20,3 +19,4 @@ steps:
|
|||
substitutions:
|
||||
_GIT_TAG: "12345"
|
||||
_PULL_BASE_REF: "master"
|
||||
_PULL_BASE_SHA: '12345'
|
||||
|
|
@ -11,7 +11,6 @@
|
|||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
ARG BASE_IMAGE
|
||||
ARG GOLANG_VERSION
|
||||
ARG ETCD_VERSION
|
||||
|
|
@ -21,6 +20,20 @@ FROM registry.k8s.io/etcd:${ETCD_VERSION} as etcd
|
|||
|
||||
FROM ${BASE_IMAGE}
|
||||
|
||||
ARG RESTY_CLI_VERSION
|
||||
ARG RESTY_CLI_SHA
|
||||
ARG LUAROCKS_VERSION
|
||||
ARG LUAROCKS_SHA
|
||||
ARG TARGETARCH
|
||||
ARG K8S_RELEASE
|
||||
ARG CHART_TESTING_VERSION
|
||||
ARG HELM_VERSION
|
||||
ARG YAMALE_VERSION
|
||||
ARG YAML_LINT_VERSION
|
||||
ARG GINKGO_VERSION
|
||||
ARG GOLINT_VERSION
|
||||
|
||||
|
||||
RUN set -eux; \
|
||||
if [ -e /etc/nsswitch.conf ]; then \
|
||||
grep '^hosts: files dns' /etc/nsswitch.conf; \
|
||||
|
|
@ -28,13 +41,16 @@ RUN set -eux; \
|
|||
echo 'hosts: files dns' > /etc/nsswitch.conf; \
|
||||
fi
|
||||
|
||||
|
||||
COPY --from=GO /usr/local/go /usr/local/go
|
||||
ENV GOPATH /go
|
||||
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
|
||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
|
||||
|
||||
COPY --from=etcd /usr/local/bin/etcd /usr/local/bin/etcd
|
||||
|
||||
RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
|
||||
RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
|
||||
|
||||
RUN apk add --no-cache \
|
||||
RUN apk update && apk upgrade && apk add --no-cache \
|
||||
bash \
|
||||
ca-certificates \
|
||||
wget \
|
||||
|
|
@ -48,19 +64,15 @@ RUN apk add --no-cache \
|
|||
py-pip \
|
||||
unzip \
|
||||
openssl \
|
||||
cfssl@testing
|
||||
cfssl@testing \
|
||||
curl \
|
||||
tzdata \
|
||||
libc6-compat
|
||||
|
||||
ENV GOPATH /go
|
||||
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
|
||||
RUN go install -v github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_VERSION} \
|
||||
&& go install golang.org/x/lint/golint@${GOLINT_VERSION}
|
||||
|
||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
|
||||
|
||||
RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0 && go install golang.org/x/lint/golint@latest
|
||||
|
||||
ARG RESTY_CLI_VERSION
|
||||
ARG RESTY_CLI_SHA
|
||||
|
||||
RUN wget -O /tmp/resty_cli.tgz \
|
||||
RUN wget -qO /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 \
|
||||
|
|
@ -68,10 +80,7 @@ RUN wget -O /tmp/resty_cli.tgz \
|
|||
&& resty -V \
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
ARG LUAROCKS_VERSION
|
||||
ARG LUAROCKS_SHA
|
||||
|
||||
RUN wget -O /tmp/luarocks.tgz \
|
||||
RUN wget -qO /tmp/luarocks.tgz \
|
||||
https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
|
||||
&& echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
|
||||
&& tar -C /tmp -xzf /tmp/luarocks.tgz \
|
||||
|
|
@ -82,48 +91,39 @@ RUN wget -O /tmp/luarocks.tgz \
|
|||
RUN luarocks install busted \
|
||||
&& luarocks install luacheck
|
||||
|
||||
ARG TARGETARCH
|
||||
|
||||
ARG K8S_RELEASE
|
||||
|
||||
RUN wget -O /usr/local/bin/kubectl \
|
||||
RUN wget -qO /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 -O /usr/local/bin/kube-apiserver \
|
||||
RUN wget -qO /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
|
||||
|
||||
ARG CHART_TESTING_VERSION
|
||||
|
||||
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 \
|
||||
RUN wget -qO /tmp/ct-${CHART_TESTING_VERSION}-linux-${TARGETARCH}.tar.gz \
|
||||
https://github.com/helm/chart-testing/releases/download/v${CHART_TESTING_VERSION}/chart-testing_${CHART_TESTING_VERSION}_linux_${TARGETARCH}.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 \
|
||||
&& tar xzvf /tmp/ct-${CHART_TESTING_VERSION}-linux-${TARGETARCH}.tar.gz -C /tmp/ct-download \
|
||||
&& rm /tmp/ct-${CHART_TESTING_VERSION}-linux-${TARGETARCH}.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/*
|
||||
|
||||
RUN wget -O /usr/local/bin/lj-releng \
|
||||
RUN wget -qO /usr/local/bin/lj-releng \
|
||||
https://raw.githubusercontent.com/openresty/openresty-devel-utils/master/lj-releng \
|
||||
&& chmod +x /usr/local/bin/lj-releng
|
||||
|
||||
ARG HELM_VERSION
|
||||
|
||||
RUN wget -O /tmp/helm.tgz \
|
||||
https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \
|
||||
RUN wget -qO /tmp/helm.tgz \
|
||||
https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \
|
||||
&& tar -C /tmp -xzf /tmp/helm.tgz \
|
||||
&& cp /tmp/linux*/helm /usr/local/bin \
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
# Install a YAML Linter
|
||||
ARG YAML_LINT_VERSION
|
||||
RUN pip install "yamllint==$YAML_LINT_VERSION"
|
||||
|
||||
# Install Yamale YAML schema validator
|
||||
ARG YAMALE_VERSION
|
||||
RUN pip install "yamale==$YAMALE_VERSION"
|
||||
|
||||
WORKDIR $GOPATH
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue