diff --git a/result/Dockerfile b/result/Dockerfile index 4fb74e8ca7..33f0ba86fb 100644 --- a/result/Dockerfile +++ b/result/Dockerfile @@ -18,7 +18,7 @@ RUN npm ci && \ COPY . . -ENV PORT 80 +ENV PORT=80 EXPOSE 80 ENTRYPOINT ["/usr/bin/tini", "--"] diff --git a/seed-data/Dockerfile b/seed-data/Dockerfile index 18e55e8429..f970e42ad4 100644 --- a/seed-data/Dockerfile +++ b/seed-data/Dockerfile @@ -13,4 +13,4 @@ COPY . . # create POST data files with ab friendly formats RUN python make-data.py -CMD /seed/generate-votes.sh \ No newline at end of file +CMD ["/seed/generate-votes.sh"] diff --git a/vote/Dockerfile b/vote/Dockerfile index 9e812ca958..2681083600 100644 --- a/vote/Dockerfile +++ b/vote/Dockerfile @@ -1,4 +1,4 @@ -# Define a base stage that uses the official python runtime base image +# base defines a base stage that uses the official python runtime base image FROM python:3.11-slim AS base # Add curl for healthcheck @@ -13,14 +13,13 @@ WORKDIR /usr/local/app COPY requirements.txt ./requirements.txt RUN pip install --no-cache-dir -r requirements.txt -# Define a stage specifically for development, where it'll watch for -# filesystem changes +# dev defines a stage for development, where it'll watch for filesystem changes FROM base AS dev RUN pip install watchdog ENV FLASK_ENV=development CMD ["python", "app.py"] -# Define the final stage that will bundle the application for production +# final defines the stage that will bundle the application for production FROM base AS final # Copy our code from the current folder to the working directory inside the container diff --git a/worker/Dockerfile b/worker/Dockerfile index cdd31baecb..a3f92d7e94 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -6,7 +6,9 @@ # to build for a different platform than your host, use --platform= # for example, if you were on Intel (amd64) and wanted to build for ARM, you would use: # docker buildx build --platform "linux/arm64/v8" . -FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:7.0 as build + +# build compiles the program for the builder's local platform +FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:7.0 AS build ARG TARGETPLATFORM ARG TARGETARCH ARG BUILDPLATFORM @@ -23,4 +25,4 @@ RUN dotnet publish -c release -o /app -a $TARGETARCH --self-contained false --no FROM mcr.microsoft.com/dotnet/runtime:7.0 WORKDIR /app COPY --from=build /app . -ENTRYPOINT ["dotnet", "Worker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Worker.dll"]