diff --git a/docker/edge-alpine.Dockerfile b/docker/edge-alpine.Dockerfile index eece22ebcb..813f36b22f 100644 --- a/docker/edge-alpine.Dockerfile +++ b/docker/edge-alpine.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 as base +FROM alpine:3.18 AS base RUN apk add --no-cache nodejs yarn npm python3 openssl build-base jq curl WORKDIR /app COPY .yarn ./.yarn @@ -15,7 +15,7 @@ ARG GITHUB_TOKEN RUN curl -L -o /tmp/desktop-client.zip --header "Authorization: Bearer ${GITHUB_TOKEN}" $(jq -r '.archive_download_url' /tmp/latest-build.json) RUN unzip /tmp/desktop-client.zip -d /public -FROM alpine:3.18 as prod +FROM alpine:3.18 AS prod RUN apk add --no-cache nodejs tini ARG USERNAME=actual diff --git a/docker/edge-ubuntu.Dockerfile b/docker/edge-ubuntu.Dockerfile index 500b226541..e45e9f4dd3 100644 --- a/docker/edge-ubuntu.Dockerfile +++ b/docker/edge-ubuntu.Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-bookworm as base +FROM node:18-bookworm AS base RUN apt-get update && apt-get install -y openssl jq WORKDIR /app COPY .yarn ./.yarn @@ -14,7 +14,7 @@ ARG GITHUB_TOKEN RUN curl -L -o /tmp/desktop-client.zip --header "Authorization: Bearer ${GITHUB_TOKEN}" $(jq -r '.archive_download_url' /tmp/latest-build.json) RUN unzip /tmp/desktop-client.zip -d /public -FROM node:18-bookworm-slim as prod +FROM node:18-bookworm-slim AS prod RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/* ARG USERNAME=actual diff --git a/docker/stable-alpine.Dockerfile b/docker/stable-alpine.Dockerfile index cc00678561..8ff468bada 100644 --- a/docker/stable-alpine.Dockerfile +++ b/docker/stable-alpine.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 as base +FROM alpine:3.18 AS base RUN apk add --no-cache nodejs yarn npm python3 openssl build-base WORKDIR /app COPY .yarn ./.yarn @@ -7,7 +7,7 @@ RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; RUN yarn workspaces focus --all --production RUN if [ "$(uname -m)" = "armv7l" ]; then npm install bcrypt better-sqlite3 --build-from-source; fi -FROM alpine:3.18 as prod +FROM alpine:3.18 AS prod RUN apk add --no-cache nodejs tini ARG USERNAME=actual diff --git a/docker/stable-ubuntu.Dockerfile b/docker/stable-ubuntu.Dockerfile index 0f20d19258..6de38b509c 100644 --- a/docker/stable-ubuntu.Dockerfile +++ b/docker/stable-ubuntu.Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-bookworm as base +FROM node:18-bookworm AS base RUN apt-get update && apt-get install -y openssl WORKDIR /app COPY .yarn ./.yarn @@ -6,7 +6,7 @@ COPY yarn.lock package.json .yarnrc.yml ./ RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi RUN yarn workspaces focus --all --production -FROM node:18-bookworm-slim as prod +FROM node:18-bookworm-slim AS prod RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/* ARG USERNAME=actual diff --git a/upcoming-release-notes/538.md b/upcoming-release-notes/538.md new file mode 100644 index 0000000000..fd2b853516 --- /dev/null +++ b/upcoming-release-notes/538.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [lnagel] +--- + +Fix WARN: FromAsCasing: 'as' and 'FROM' keywords' casing do not match in Dockerfiles