From 5d792c09bef73c12df46c48fe197418254093f0c Mon Sep 17 00:00:00 2001 From: Ryan Lo Date: Fri, 22 Nov 2024 23:39:56 +0800 Subject: [PATCH] Bump docker/build-push-action to v6 (#5747) * Bump docker/build-push-action to v6 Signed-off-by: Ryan Lo * fix format warnings Signed-off-by: Ryan Lo --------- Signed-off-by: Ryan Lo --- .github/workflows/publish.yml | 2 +- .github/workflows/sandbox.yml | 2 +- .github/workflows/single-binary.yml | 10 +++++----- Dockerfile | 10 +++++----- Dockerfile.datacatalog | 6 +++--- Dockerfile.flyteadmin | 8 ++++---- Dockerfile.flytecopilot | 8 ++++---- Dockerfile.flytepropeller | 8 ++++---- Dockerfile.flytescheduler | 8 ++++---- docker/sandbox/Dockerfile | 6 +++--- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fe2f8535af..506eca5ae9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,7 +59,7 @@ jobs: - name: Before Build run: ${{ inputs.before-build }} - name: Build and Push Image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . file: ${{ inputs.dockerfile }} diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml index 0899ec83e6..1e18109277 100644 --- a/.github/workflows/sandbox.yml +++ b/.github/workflows/sandbox.yml @@ -53,7 +53,7 @@ jobs: username: "${{ secrets.FLYTE_BOT_USERNAME }}" password: "${{ secrets.FLYTE_BOT_PAT }}" - name: Build and push DIND Image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: context: . platforms: linux/arm64, linux/amd64 diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml index 92fb5e53e3..0f64525860 100644 --- a/.github/workflows/single-binary.yml +++ b/.github/workflows/single-binary.yml @@ -73,7 +73,7 @@ jobs: run: | mkdir -p docker/sandbox-bundled/images/tar/{arm64,amd64} - name: Export ARM64 Image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . platforms: linux/arm64 @@ -84,7 +84,7 @@ jobs: file: Dockerfile outputs: type=docker,dest=docker/sandbox-bundled/images/tar/arm64/flyte-binary.tar - name: Export AMD64 Image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64 @@ -108,7 +108,7 @@ jobs: password: "${{ secrets.FLYTE_BOT_PAT }}" - name: Build and push Image if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . platforms: linux/arm64, linux/amd64 @@ -144,7 +144,7 @@ jobs: driver-opts: image=moby/buildkit:master buildkitd-flags: "--allow-insecure-entitlement security.insecure" - name: Build sandbox image for functional tests - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: docker/sandbox-bundled load: true @@ -240,7 +240,7 @@ jobs: username: "${{ secrets.FLYTE_BOT_USERNAME }}" password: "${{ secrets.FLYTE_BOT_PAT }}" - name: Build and push multi-arch image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: docker/sandbox-bundled allow: "security.insecure" diff --git a/Dockerfile b/Dockerfile index fc32351ebe..ead022d036 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM ghcr.io/flyteorg/flyteconsole:${FLYTECONSOLE_VERSION} AS flyteconsole FROM --platform=${BUILDPLATFORM} golang:1.22-bookworm AS flytebuilder ARG TARGETARCH -ENV GOARCH "${TARGETARCH}" -ENV GOOS linux +ENV GOARCH="${TARGETARCH}" +ENV GOOS=linux WORKDIR /flyteorg/build @@ -29,10 +29,10 @@ RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/r FROM debian:bookworm-slim ARG FLYTE_VERSION -ENV FLYTE_VERSION "${FLYTE_VERSION}" +ENV FLYTE_VERSION="${FLYTE_VERSION}" -ENV DEBCONF_NONINTERACTIVE_SEEN true -ENV DEBIAN_FRONTEND noninteractive +ENV DEBCONF_NONINTERACTIVE_SEEN=true +ENV DEBIAN_FRONTEND=noninteractive # Install core packages RUN apt-get update && apt-get install --no-install-recommends --yes \ diff --git a/Dockerfile.datacatalog b/Dockerfile.datacatalog index b6bfc8707d..80f683a40f 100644 --- a/Dockerfile.datacatalog +++ b/Dockerfile.datacatalog @@ -3,12 +3,12 @@ # # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst -FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder ARG TARGETARCH -ENV GOARCH "${TARGETARCH}" -ENV GOOS linux +ENV GOARCH="${TARGETARCH}" +ENV GOOS=linux RUN apk add git openssh-client make curl diff --git a/Dockerfile.flyteadmin b/Dockerfile.flyteadmin index 2fe21cccc2..9e33229959 100644 --- a/Dockerfile.flyteadmin +++ b/Dockerfile.flyteadmin @@ -3,11 +3,11 @@ # # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst -FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder ARG TARGETARCH -ENV GOARCH "${TARGETARCH}" -ENV GOOS linux +ENV GOARCH="${TARGETARCH}" +ENV GOOS=linux RUN apk add git openssh-client make curl @@ -41,7 +41,7 @@ ENV PATH="/artifacts:${PATH}" # This will eventually move to centurylink/ca-certs:latest for minimum possible image size FROM alpine:3.18 -LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteadmin +LABEL org.opencontainers.image.source=https://github.com/flyteorg/flyteadmin COPY --from=builder /artifacts /bin diff --git a/Dockerfile.flytecopilot b/Dockerfile.flytecopilot index 44107f1097..66e1d2c295 100644 --- a/Dockerfile.flytecopilot +++ b/Dockerfile.flytecopilot @@ -3,12 +3,12 @@ # # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst -FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder ARG TARGETARCH -ENV GOARCH "${TARGETARCH}" -ENV GOOS linux +ENV GOARCH="${TARGETARCH}" +ENV GOOS=linux RUN apk add git openssh-client make curl @@ -32,7 +32,7 @@ ENV PATH="/artifacts:${PATH}" # This will eventually move to centurylink/ca-certs:latest for minimum possible image size FROM alpine:3.18 -LABEL org.opencontainers.image.source https://github.com/lyft/flyteplugins +LABEL org.opencontainers.image.source=https://github.com/lyft/flyteplugins COPY --from=builder /artifacts /bin diff --git a/Dockerfile.flytepropeller b/Dockerfile.flytepropeller index 058d78b219..4963a530a4 100644 --- a/Dockerfile.flytepropeller +++ b/Dockerfile.flytepropeller @@ -4,12 +4,12 @@ # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst -FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder ARG TARGETARCH -ENV GOARCH "${TARGETARCH}" -ENV GOOS linux +ENV GOARCH="${TARGETARCH}" +ENV GOOS=linux RUN apk add git openssh-client make curl @@ -33,7 +33,7 @@ ENV PATH="/artifacts:${PATH}" # This will eventually move to centurylink/ca-certs:latest for minimum possible image size FROM alpine:3.18 -LABEL org.opencontainers.image.source https://github.com/flyteorg/flytepropeller +LABEL org.opencontainers.image.source=https://github.com/flyteorg/flytepropeller COPY --from=builder /artifacts /bin diff --git a/Dockerfile.flytescheduler b/Dockerfile.flytescheduler index b22d050fc9..a7119d0d9b 100644 --- a/Dockerfile.flytescheduler +++ b/Dockerfile.flytescheduler @@ -4,12 +4,12 @@ # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst -FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 as builder +FROM --platform=${BUILDPLATFORM} golang:1.22-alpine3.18 AS builder ARG TARGETARCH -ENV GOARCH "${TARGETARCH}" -ENV GOOS linux +ENV GOARCH="${TARGETARCH}" +ENV GOOS=linux RUN apk add git openssh-client make curl @@ -36,7 +36,7 @@ ENV PATH="/artifacts:${PATH}" # This will eventually move to centurylink/ca-certs:latest for minimum possible image size FROM alpine:3.18 -LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteadmin +LABEL org.opencontainers.image.source=https://github.com/flyteorg/flyteadmin COPY --from=builder /artifacts /bin diff --git a/docker/sandbox/Dockerfile b/docker/sandbox/Dockerfile index 2a77a20472..40c3e83e83 100644 --- a/docker/sandbox/Dockerfile +++ b/docker/sandbox/Dockerfile @@ -52,13 +52,13 @@ COPY --from=base /flyteorg/ /flyteorg/ COPY docker/sandbox/flyte-entrypoint-default.sh /flyteorg/bin/flyte-entrypoint.sh ARG FLYTE_VERSION="latest" -ENV FLYTE_VERSION "${FLYTE_VERSION}" +ENV FLYTE_VERSION="${FLYTE_VERSION}" ARG FLYTE_TEST="release" -ENV FLYTE_TEST "${FLYTE_TEST}" +ENV FLYTE_TEST="${FLYTE_TEST}" # Update PATH variable -ENV PATH "/flyteorg/bin:${PATH}" +ENV PATH="/flyteorg/bin:${PATH}" # Declare volumes for k3s VOLUME /var/lib/kubelet