Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump docker/build-push-action to v6 #5747

Merged
merged 2 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/single-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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
Expand All @@ -83,7 +83,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
Expand All @@ -107,7 +107,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
Expand Down Expand Up @@ -143,7 +143,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
Expand Down Expand Up @@ -239,7 +239,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"
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.datacatalog
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.flyteadmin
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.flytecopilot
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.flytepropeller
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.flytescheduler
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docker/sandbox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading