From 5a7396badab7859ea8211a25982c27a20b683f27 Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Thu, 12 Dec 2024 17:19:50 +0800 Subject: [PATCH] :construction_worker: fix case and PYTHONPATH env warning in Dockerfile --- docker/Dockerfile | 2 +- docker/Dockerfile_with_frontend | 7 +++---- docker/Dockerfile_with_frontend_sentry | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a7f7288..8de4362 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.11.0 as frontend +FROM node:22.11.0 AS frontend ADD . /app WORKDIR /app/admin-frontend RUN npm install -g pnpm diff --git a/docker/Dockerfile_with_frontend b/docker/Dockerfile_with_frontend index 6ba6f36..df761da 100644 --- a/docker/Dockerfile_with_frontend +++ b/docker/Dockerfile_with_frontend @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.10 -FROM python:3.11-slim-bullseye as base +FROM python:3.11-slim-bullseye AS base -FROM base as builder +FROM base AS builder ENV PYTHONFAULTHANDLER=1 \ PYTHONUNBUFFERED=1 \ @@ -12,7 +12,6 @@ ENV PYTHONFAULTHANDLER=1 \ POETRY_NO_INTERACTION=1 \ POETRY_VIRTUALENVS_CREATE=false \ PATH="$PATH:/runtime/bin" \ - PYTHONPATH="$PYTHONPATH:/runtime/lib/python3.10/site-packages" \ # Versions: POETRY_VERSION=1.7.1 RUN apt-get update && apt-get install -y build-essential unzip wget python-dev git @@ -25,7 +24,7 @@ COPY README.md pyproject.toml poetry.lock /src/ RUN poetry export --only=main,docker --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt RUN pip install --prefix=/runtime --force-reinstall -r requirements.txt -FROM base as runtime +FROM base AS runtime WORKDIR /app RUN --mount=type=cache,target=/var/cache/apt \ diff --git a/docker/Dockerfile_with_frontend_sentry b/docker/Dockerfile_with_frontend_sentry index efc4229..3545069 100644 --- a/docker/Dockerfile_with_frontend_sentry +++ b/docker/Dockerfile_with_frontend_sentry @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.10 -FROM python:3.11-slim-bullseye as base +FROM python:3.11-slim-bullseye AS base -FROM base as builder +FROM base AS builder ENV PYTHONFAULTHANDLER=1 \ PYTHONUNBUFFERED=1 \ @@ -12,7 +12,6 @@ ENV PYTHONFAULTHANDLER=1 \ POETRY_NO_INTERACTION=1 \ POETRY_VIRTUALENVS_CREATE=false \ PATH="$PATH:/runtime/bin" \ - PYTHONPATH="$PYTHONPATH:/runtime/lib/python3.10/site-packages" \ # Versions: POETRY_VERSION=1.7.1 RUN apt-get update && apt-get install -y build-essential unzip wget python3-dev git @@ -25,7 +24,7 @@ COPY pyproject.toml poetry.lock /src/ RUN poetry export --only=main,docker --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt RUN pip install --prefix=/runtime --force-reinstall -r requirements.txt -FROM base as runtime +FROM base AS runtime WORKDIR /app RUN --mount=type=cache,target=/var/cache/apt \