From 2974cdbbee980d063a4c774d08b78139a1bc0725 Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Mon, 5 Aug 2024 08:07:28 -0400 Subject: [PATCH] chore: dockerfile casing (#11588) --- cli/Dockerfile | 2 +- machine-learning/Dockerfile | 20 ++++++++++---------- server/Dockerfile | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cli/Dockerfile b/cli/Dockerfile index e9c8ab630c..2c4aaf8718 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.16.0-alpine3.20@sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 as core +FROM node:20.16.0-alpine3.20@sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 AS core WORKDIR /usr/src/open-api/typescript-sdk COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./ diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile index ecde1def22..9a411354c7 100644 --- a/machine-learning/Dockerfile +++ b/machine-learning/Dockerfile @@ -1,12 +1,12 @@ ARG DEVICE=cpu -FROM python:3.11-bookworm@sha256:f89d36dbb4728313572f88877b8be7d11fd03bea964cdf0a6b0f61edfcde3709 as builder-cpu +FROM python:3.11-bookworm@sha256:f89d36dbb4728313572f88877b8be7d11fd03bea964cdf0a6b0f61edfcde3709 AS builder-cpu -FROM builder-cpu as builder-openvino +FROM builder-cpu AS builder-openvino -FROM builder-cpu as builder-cuda +FROM builder-cpu AS builder-cuda -FROM builder-cpu as builder-armnn +FROM builder-cpu AS builder-armnn ENV ARMNN_PATH=/opt/armnn COPY ann /opt/ann @@ -15,7 +15,7 @@ RUN mkdir /opt/armnn && \ cd /opt/ann && \ sh build.sh -FROM builder-${DEVICE} as builder +FROM builder-${DEVICE} AS builder ARG DEVICE ENV PYTHONDONTWRITEBYTECODE=1 \ @@ -34,9 +34,9 @@ RUN python3 -m venv /opt/venv COPY poetry.lock pyproject.toml ./ RUN poetry install --sync --no-interaction --no-ansi --no-root --with ${DEVICE} --without dev -FROM python:3.11-slim-bookworm@sha256:7f49f147e57a65a5ca731203ed350ac5c88fa54aeb942924dd7057fe34a18e79 as prod-cpu +FROM python:3.11-slim-bookworm@sha256:7f49f147e57a65a5ca731203ed350ac5c88fa54aeb942924dd7057fe34a18e79 AS prod-cpu -FROM prod-cpu as prod-openvino +FROM prod-cpu AS prod-openvino COPY scripts/configure-apt.sh ./ RUN ./configure-apt.sh && \ @@ -44,13 +44,13 @@ RUN ./configure-apt.sh && \ apt-get install -t unstable --no-install-recommends -yqq intel-opencl-icd && \ rm configure-apt.sh -FROM nvidia/cuda:12.3.2-cudnn9-runtime-ubuntu22.04@sha256:fa44193567d1908f7ca1f3abf8623ce9c63bc8cba7bcfdb32702eb04d326f7a8 as prod-cuda +FROM nvidia/cuda:12.3.2-cudnn9-runtime-ubuntu22.04@sha256:fa44193567d1908f7ca1f3abf8623ce9c63bc8cba7bcfdb32702eb04d326f7a8 AS prod-cuda COPY --from=builder-cuda /usr/local/bin/python3 /usr/local/bin/python3 COPY --from=builder-cuda /usr/local/lib/python3.11 /usr/local/lib/python3.11 COPY --from=builder-cuda /usr/local/lib/libpython3.11.so /usr/local/lib/libpython3.11.so -FROM prod-cpu as prod-armnn +FROM prod-cpu AS prod-armnn ENV LD_LIBRARY_PATH=/opt/armnn @@ -70,7 +70,7 @@ COPY --from=builder-armnn \ /opt/ann/build.sh \ /opt/armnn/ -FROM prod-${DEVICE} as prod +FROM prod-${DEVICE} AS prod ARG DEVICE RUN apt-get update && \ diff --git a/server/Dockerfile b/server/Dockerfile index 81b0ea67d6..c618de4277 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,5 +1,5 @@ # dev build -FROM ghcr.io/immich-app/base-server-dev:20240730@sha256:3e03f236d7669d0b27fbd49bc617df69fbb719cec2310a1c7ed8291236648c22 as dev +FROM ghcr.io/immich-app/base-server-dev:20240730@sha256:3e03f236d7669d0b27fbd49bc617df69fbb719cec2310a1c7ed8291236648c22 AS dev RUN apt-get install --no-install-recommends -yqq tini WORKDIR /usr/src/app @@ -25,7 +25,7 @@ COPY --from=dev /usr/src/app/node_modules/@img ./node_modules/@img COPY --from=dev /usr/src/app/node_modules/exiftool-vendored.pl ./node_modules/exiftool-vendored.pl # web build -FROM node:20.16.0-alpine3.20@sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 as web +FROM node:20.16.0-alpine3.20@sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 AS web WORKDIR /usr/src/open-api/typescript-sdk COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./