From 6e10c763917b3265ab3f88a1f5b7d2cea468e2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E9=88=9E?= Date: Sun, 25 Aug 2024 20:28:16 +0800 Subject: [PATCH] style: standardize Dockerfile stage naming conventions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FromAsCasing: 'as' and 'FROM' keywords' casing do not match - Standardize Dockerfile stage naming conventions to use uppercase `AS` instead of lowercase `as`. Signed-off-by: 陳鈞 --- Dockerfile | 12 ++++++------ ubi.Dockerfile | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 955d5dd..e96ec7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ARG HF_HOME=${CACHE_HOME}/huggingface ######################################## # Base stage ######################################## -FROM python:3.11-slim as base +FROM python:3.11-slim AS base # RUN mount cache for multi-arch: https://github.com/docker/buildx/issues/549#issuecomment-1788297892 ARG TARGETARCH @@ -40,7 +40,7 @@ RUN --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT,sharing=locked,target=/v ######################################## # Build stage ######################################## -FROM base as build +FROM base AS build # RUN mount cache for multi-arch: https://github.com/docker/buildx/issues/549#issuecomment-1788297892 ARG TARGETARCH @@ -79,7 +79,7 @@ RUN --mount=type=cache,id=pip-$TARGETARCH$TARGETVARIANT,sharing=locked,target=/r ######################################## # Final stage for no_model ######################################## -FROM base as no_model +FROM base AS no_model ENV NVIDIA_VISIBLE_DEVICES all ENV NVIDIA_DRIVER_CAPABILITIES compute,utility @@ -158,7 +158,7 @@ LABEL name="jim60105/docker-whisperX" \ # load_whisper stage # This stage will be tagged for caching in CI. ######################################## -FROM ${NO_MODEL_STAGE} as load_whisper +FROM ${NO_MODEL_STAGE} AS load_whisper ARG TORCH_HOME ARG HF_HOME @@ -173,7 +173,7 @@ RUN python3 -c 'import faster_whisper; model = faster_whisper.WhisperModel("'${W ######################################## # load_align stage ######################################## -FROM ${LOAD_WHISPER_STAGE} as load_align +FROM ${LOAD_WHISPER_STAGE} AS load_align ARG TORCH_HOME ARG HF_HOME @@ -187,7 +187,7 @@ RUN --mount=source=load_align_model.py,target=load_align_model.py \ ######################################## # Final stage with model ######################################## -FROM ${NO_MODEL_STAGE} as final +FROM ${NO_MODEL_STAGE} AS final ARG UID diff --git a/ubi.Dockerfile b/ubi.Dockerfile index 1505ff1..d10d553 100644 --- a/ubi.Dockerfile +++ b/ubi.Dockerfile @@ -21,7 +21,7 @@ ARG HF_HOME=${CACHE_HOME}/huggingface ######################################## # Base stage ######################################## -FROM registry.access.redhat.com/ubi9/ubi-minimal as base +FROM registry.access.redhat.com/ubi9/ubi-minimal AS base ENV PYTHON_VERSION=3.11 ENV PYTHONUNBUFFERED=1 @@ -43,7 +43,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ ######################################## # Build stage ######################################## -FROM base as build +FROM base AS build # Install build time requirements RUN microdnf -y install --setopt=install_weak_deps=0 --setopt=tsflags=nodocs git python3.11-pip findutils && \ @@ -86,7 +86,7 @@ RUN --mount=type=cache,id=pip-$TARGETARCH$TARGETVARIANT,sharing=locked,target=/r ######################################## # Final stage for no_model ######################################## -FROM base as no_model +FROM base AS no_model ENV NVIDIA_VISIBLE_DEVICES all ENV NVIDIA_DRIVER_CAPABILITIES compute,utility @@ -157,7 +157,7 @@ LABEL name="jim60105/docker-whisperX" \ # load_whisper stage # This stage will be tagged for caching in CI. ######################################## -FROM ${NO_MODEL_STAGE} as load_whisper +FROM ${NO_MODEL_STAGE} AS load_whisper ARG TORCH_HOME ARG HF_HOME @@ -172,7 +172,7 @@ RUN python3 -c 'import faster_whisper; model = faster_whisper.WhisperModel("'${W ######################################## # load_align stage ######################################## -FROM ${LOAD_WHISPER_STAGE} as load_align +FROM ${LOAD_WHISPER_STAGE} AS load_align ARG TORCH_HOME ARG HF_HOME @@ -186,7 +186,7 @@ RUN --mount=source=load_align_model.py,target=load_align_model.py \ ######################################## # Final stage with model ######################################## -FROM ${NO_MODEL_STAGE} as final +FROM ${NO_MODEL_STAGE} AS final ARG UID