Merge pull request #1899 from hj-johannes-lee/PR-2024-012

mythi · web-flow · commit c02631e68a3d · 2024-11-08T08:37:40.000+02:00
Dockerfiles: fix warning for 'FromAsCasing'
diff --git a/build/docker/intel-deviceplugin-operator.Dockerfile b/build/docker/intel-deviceplugin-operator.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-dlb-initcontainer.Dockerfile b/build/docker/intel-dlb-initcontainer.Dockerfile
@@ -35,7 +35,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 WORKDIR $DIR
 COPY . .
diff --git a/build/docker/intel-dlb-plugin.Dockerfile b/build/docker/intel-dlb-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-dsa-plugin.Dockerfile b/build/docker/intel-dsa-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-fpga-admissionwebhook.Dockerfile b/build/docker/intel-fpga-admissionwebhook.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile
@@ -35,7 +35,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-fpga-plugin.Dockerfile b/build/docker/intel-fpga-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-gpu-fakedev.Dockerfile b/build/docker/intel-gpu-fakedev.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-gpu-initcontainer.Dockerfile b/build/docker/intel-gpu-initcontainer.Dockerfile
@@ -35,7 +35,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-gpu-levelzero.Dockerfile b/build/docker/intel-gpu-levelzero.Dockerfile
@@ -24,7 +24,7 @@ ARG ROCKYLINUX=1
 ARG BUILD_BASE=rockylinux:9
 ARG FINAL_BASE_DYN=registry.access.redhat.com/ubi9/ubi-minimal:9.3
 ###
-FROM ${BUILD_BASE} as builder
+FROM ${BUILD_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ENV CGO_CFLAGS="-pipe -fno-plt"
 ENV CGO_LDFLAGS="-fstack-protector-strong -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now,-z,noexecstack,-z,defs,-s,-w"
diff --git a/build/docker/intel-gpu-plugin.Dockerfile b/build/docker/intel-gpu-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-iaa-plugin.Dockerfile b/build/docker/intel-iaa-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-qat-initcontainer.Dockerfile b/build/docker/intel-qat-initcontainer.Dockerfile
@@ -35,7 +35,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 WORKDIR $DIR
 COPY . .
diff --git a/build/docker/intel-qat-plugin-kerneldrv.Dockerfile b/build/docker/intel-qat-plugin-kerneldrv.Dockerfile
@@ -35,7 +35,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-qat-plugin.Dockerfile b/build/docker/intel-qat-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-sgx-admissionwebhook.Dockerfile b/build/docker/intel-sgx-admissionwebhook.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-sgx-initcontainer.Dockerfile b/build/docker/intel-sgx-initcontainer.Dockerfile
@@ -35,7 +35,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-sgx-plugin.Dockerfile b/build/docker/intel-sgx-plugin.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/intel-xpumanager-sidecar.Dockerfile b/build/docker/intel-xpumanager-sidecar.Dockerfile
@@ -36,7 +36,7 @@ ARG FINAL_BASE=registry.access.redhat.com/ubi9-micro:latest
 ## The main branch defaults to using the latest Golang base image.
 ARG GOLANG_BASE=golang:1.23-bookworm
 ###
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 ARG DIR=/intel-device-plugins-for-kubernetes
 ARG GO111MODULE=on
 ARG LDFLAGS="all=-w -s"
diff --git a/build/docker/lib/default_plugin.docker b/build/docker/lib/default_plugin.docker
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 #include "default_args.docker"
 
diff --git a/build/docker/templates/intel-dlb-initcontainer.Dockerfile.in b/build/docker/templates/intel-dlb-initcontainer.Dockerfile.in
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 ARG DIR=/intel-device-plugins-for-kubernetes
 WORKDIR $DIR
diff --git a/build/docker/templates/intel-fpga-initcontainer.Dockerfile.in b/build/docker/templates/intel-fpga-initcontainer.Dockerfile.in
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 #include "default_args.docker"
 ARG CRI_HOOK=intel-fpga-crihook
diff --git a/build/docker/templates/intel-gpu-initcontainer.Dockerfile.in b/build/docker/templates/intel-gpu-initcontainer.Dockerfile.in
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 #include "default_args.docker"
 
diff --git a/build/docker/templates/intel-gpu-levelzero.Dockerfile.in b/build/docker/templates/intel-gpu-levelzero.Dockerfile.in
@@ -12,7 +12,7 @@ ARG BUILD_BASE=rockylinux:9
 ARG FINAL_BASE_DYN=registry.access.redhat.com/ubi9/ubi-minimal:9.3
 ###
 
-FROM ${BUILD_BASE} as builder
+FROM ${BUILD_BASE} AS builder
 
 ARG DIR=/intel-device-plugins-for-kubernetes
 
diff --git a/build/docker/templates/intel-qat-initcontainer.Dockerfile.in b/build/docker/templates/intel-qat-initcontainer.Dockerfile.in
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 ARG DIR=/intel-device-plugins-for-kubernetes
 WORKDIR $DIR
diff --git a/build/docker/templates/intel-qat-plugin-kerneldrv.Dockerfile.in b/build/docker/templates/intel-qat-plugin-kerneldrv.Dockerfile.in
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 #include "default_args.docker"
 
diff --git a/build/docker/templates/intel-sgx-initcontainer.Dockerfile.in b/build/docker/templates/intel-sgx-initcontainer.Dockerfile.in
@@ -1,7 +1,7 @@
 #include "final_base.docker"
 #include "golang_base.docker"
 
-FROM ${GOLANG_BASE} as builder
+FROM ${GOLANG_BASE} AS builder
 
 #include "default_args.docker"
 
diff --git a/demo/crypto-perf/Dockerfile b/demo/crypto-perf/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid-slim as builder
+FROM debian:sid-slim AS builder
 
 ARG DIR=/dpdk-build
 WORKDIR $DIR
diff --git a/demo/dlb-dpdk-demo/Dockerfile b/demo/dlb-dpdk-demo/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as builder
+FROM ubuntu:20.04 AS builder
 
 ARG DIR=/dpdk-build
 WORKDIR $DIR
