Skip to content

Commit

Permalink
fix format warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
lowc1012 committed Sep 27, 2024
1 parent 76e3d65 commit 66f3e82
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 27 deletions.
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

0 comments on commit 66f3e82

Please sign in to comment.