From 3014bef4195e3fc0b673c3240a3399c095c1a588 Mon Sep 17 00:00:00 2001 From: kranurag7 <81210977+kranurag7@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:53:44 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B1=20change=20casing=20from=20as=20to?= =?UTF-8?q?=20AS=20in=20Dockerfile=20(#1385)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit change casing from as to AS in Dockerfile this was giving me warning locally and this commit fixes the same. Docker version used locally is 27.0.3 Signed-off-by: kranurag7 <81210977+kranurag7@users.noreply.github.com> --- images/builder/Dockerfile | 8 ++++---- images/cache/Dockerfile | 8 ++++---- images/caph/Dockerfile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index 4e810659d..fa8440464 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -17,7 +17,7 @@ # If you make changes to this Dockerfile run `make builder-image-push`. # Install Lychee -FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as lychee +FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b AS lychee # update: datasource=github-tags depName=lycheeverse/lychee versioning=semver ENV LYCHEE_VERSION="v0.15.1" # hadolint ignore=DL3018 @@ -28,7 +28,7 @@ RUN apk add --no-cache curl && \ rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz # Install Golang CI Lint -FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as golangci +FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b AS golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver ENV GOLANGCI_VERSION="v1.59.1" WORKDIR / @@ -37,10 +37,10 @@ RUN apk add --no-cache curl && \ curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_VERSION} # Install Hadolint -FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint +FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 AS hadolint # Install Trivy -FROM docker.io/aquasec/trivy:0.52.1@sha256:fccab5c313e08e38c12ee4331641de03ac2f8824fd6d41b7dd9ee1a6c2d3680b as trivy +FROM docker.io/aquasec/trivy:0.52.1@sha256:fccab5c313e08e38c12ee4331641de03ac2f8824fd6d41b7dd9ee1a6c2d3680b AS trivy ############################ # Caph Build Image Base # diff --git a/images/cache/Dockerfile b/images/cache/Dockerfile index fb8362431..e866aeb94 100644 --- a/images/cache/Dockerfile +++ b/images/cache/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM docker.io/library/alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 as import-cache +FROM docker.io/library/alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 AS import-cache RUN --mount=type=bind,target=/host-tmp \ --mount=type=cache,target=/root/.cache \ @@ -27,15 +27,15 @@ RUN --mount=type=bind,target=/host-tmp \ tar xzf /host-tmp/go-pkg-cache.tar.gz --no-same-owner -C /go/pkg; \ fi -FROM docker.io/library/alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 as cache-creator +FROM docker.io/library/alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 AS cache-creator RUN --mount=type=cache,target=/root/.cache \ --mount=type=cache,target=/go/pkg \ tar czf /tmp/go-build-cache.tar.gz -C /root/.cache/go-build . ; \ tar czf /tmp/go-pkg-cache.tar.gz -C /go/pkg . -FROM scratch as export-cache +FROM scratch AS export-cache COPY --from=cache-creator \ /tmp/go-build-cache.tar.gz \ /tmp/go-pkg-cache.tar.gz \ - /tmp/ \ No newline at end of file + /tmp/ diff --git a/images/caph/Dockerfile b/images/caph/Dockerfile index a3f215909..4f02ec6a5 100644 --- a/images/caph/Dockerfile +++ b/images/caph/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.21.6-bullseye@sha256:a8712f27d9ac742e7bded8f81f7547c5635e855e8b80302e8fc0ce424f559295 as build +FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.21.6-bullseye@sha256:a8712f27d9ac742e7bded8f81f7547c5635e855e8b80302e8fc0ce424f559295 AS build ARG TARGETOS TARGETARCH COPY . /src/cluster-api-provider-hetzner