From 043ad0b35485fc3e285306acac449f55d94c4324 Mon Sep 17 00:00:00 2001 From: Tobin Feldman-Fitzthum Date: Mon, 4 Nov 2024 14:28:54 -0600 Subject: [PATCH] Dockerfile: fix capitalization Docker prefers that statements using FROM and AS have those two words in the same case and will even warn you about it if you don't. See https://docs.docker.com/reference/build-checks/from-as-casing/ Signed-off-by: Tobin Feldman-Fitzthum --- attestation-service/docker/as-grpc/Dockerfile | 4 ++-- attestation-service/docker/as-restful/Dockerfile | 4 ++-- kbs/docker/Dockerfile | 2 +- kbs/docker/coco-as-grpc/Dockerfile | 2 +- kbs/docker/intel-trust-authority/Dockerfile | 2 +- kbs/docker/rhel-ubi/Dockerfile | 2 +- rvps/docker/Dockerfile | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/attestation-service/docker/as-grpc/Dockerfile b/attestation-service/docker/as-grpc/Dockerfile index ab770d97f..4ad794068 100644 --- a/attestation-service/docker/as-grpc/Dockerfile +++ b/attestation-service/docker/as-grpc/Dockerfile @@ -2,7 +2,7 @@ # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -FROM rust:latest as builder +FROM rust:latest AS builder ARG ARCH=x86_64 WORKDIR /usr/src/attestation-service @@ -44,4 +44,4 @@ VOLUME /opt/confidential-containers/attestation-service CMD ["grpc-as", "--socket", "0.0.0.0:50004"] -EXPOSE 50004 \ No newline at end of file +EXPOSE 50004 diff --git a/attestation-service/docker/as-restful/Dockerfile b/attestation-service/docker/as-restful/Dockerfile index 42a9352fe..349621152 100644 --- a/attestation-service/docker/as-restful/Dockerfile +++ b/attestation-service/docker/as-restful/Dockerfile @@ -2,7 +2,7 @@ # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -FROM rust:latest as builder +FROM rust:latest AS builder ARG ARCH=x86_64 WORKDIR /usr/src/attestation-service @@ -45,4 +45,4 @@ VOLUME /opt/confidential-containers/attestation-service CMD ["restful-as", "--socket", "0.0.0.0:8080", "--config-file", "/etc/config.json"] -EXPOSE 8080 \ No newline at end of file +EXPOSE 8080 diff --git a/kbs/docker/Dockerfile b/kbs/docker/Dockerfile index f6bd8294a..ec9ae43f8 100644 --- a/kbs/docker/Dockerfile +++ b/kbs/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:slim as builder +FROM rust:slim AS builder ARG ARCH=x86_64 ARG ALIYUN=false diff --git a/kbs/docker/coco-as-grpc/Dockerfile b/kbs/docker/coco-as-grpc/Dockerfile index 67f099e6a..654d22779 100644 --- a/kbs/docker/coco-as-grpc/Dockerfile +++ b/kbs/docker/coco-as-grpc/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:latest as builder +FROM rust:latest AS builder ARG ARCH=x86_64 ARG ALIYUN=false diff --git a/kbs/docker/intel-trust-authority/Dockerfile b/kbs/docker/intel-trust-authority/Dockerfile index 0638b9cf8..d7be1aa7d 100644 --- a/kbs/docker/intel-trust-authority/Dockerfile +++ b/kbs/docker/intel-trust-authority/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:latest as builder +FROM rust:latest AS builder ARG ALIYUN=false WORKDIR /usr/src/kbs diff --git a/kbs/docker/rhel-ubi/Dockerfile b/kbs/docker/rhel-ubi/Dockerfile index a49ee0aae..6f6a128e9 100644 --- a/kbs/docker/rhel-ubi/Dockerfile +++ b/kbs/docker/rhel-ubi/Dockerfile @@ -1,5 +1,5 @@ # Use CentOS Stream to build. -FROM quay.io/centos/centos:stream9 as builder +FROM quay.io/centos/centos:stream9 AS builder # Install build dependencies from CentOS repos. RUN dnf -y --setopt=install_weak_deps=0 --enablerepo=crb install \ diff --git a/rvps/docker/Dockerfile b/rvps/docker/Dockerfile index 41f57355a..be466a121 100644 --- a/rvps/docker/Dockerfile +++ b/rvps/docker/Dockerfile @@ -2,7 +2,7 @@ # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -FROM rust:latest as builder +FROM rust:latest AS builder WORKDIR /usr/src/rvps @@ -22,4 +22,4 @@ CMD ["rvps"] VOLUME /opt/confidential-containers/attestation-service/reference_values/ -EXPOSE 50003 \ No newline at end of file +EXPOSE 50003