From cb24ed5864227678ddb5e5cdb770ec9c45af3502 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:52:16 +0000 Subject: [PATCH 1/2] chore(deps): update dockerfile dependencies (#2363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | lukemathwalker/cargo-chef | stage | digest | `a21bea8` -> `1c79ba9` | | [node](https://redirect.github.com/nodejs/node) | final | digest | `348b3e6` -> `6e80991` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "after 5pm on monday" in timezone Etc/UTC, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/PeerDB-io/peerdb). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- stacks/peerdb-server.Dockerfile | 2 +- stacks/peerdb-ui.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stacks/peerdb-server.Dockerfile b/stacks/peerdb-server.Dockerfile index 3c3ef4d532..ae918a6b6f 100644 --- a/stacks/peerdb-server.Dockerfile +++ b/stacks/peerdb-server.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1@sha256:db1ff77fb637a5955317c7a3a62540196396d565f3dd5742e76dddbb6d75c4c5 -FROM lukemathwalker/cargo-chef:latest-rust-alpine3.20@sha256:a21bea8193af20b977fe2061c068a8c6d557a47b8f20fddf84667b98c4446ab8 as chef +FROM lukemathwalker/cargo-chef:latest-rust-alpine3.20@sha256:1c79ba91752ef8df8085c1477d9981550af94f619372536327056f72c709f977 as chef WORKDIR /root FROM chef as planner diff --git a/stacks/peerdb-ui.Dockerfile b/stacks/peerdb-ui.Dockerfile index 847c4a3781..b0fd544bc1 100644 --- a/stacks/peerdb-ui.Dockerfile +++ b/stacks/peerdb-ui.Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.12@sha256:db1ff77fb637a5955317c7a3a62540196396d565f3dd5742e76dddbb6d75c4c5 # Base stage -FROM node:22-alpine@sha256:348b3e6ff4eb6b9ac7c9cc5324b90bf8fc2b7b97621ca1e9e985b7c80f7ce6b3 AS base +FROM node:22-alpine@sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 AS base ENV NPM_CONFIG_UPDATE_NOTIFIER=false RUN apk add --no-cache openssl && \ mkdir /app && \ From 1e49a18410f03ec8d1305536f2f63efb38c38870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Mon, 16 Dec 2024 18:06:59 +0000 Subject: [PATCH 2/2] fix docker warnings (#2368) --- stacks/peerdb-server.Dockerfile | 8 +++++--- stacks/peerdb-ui.Dockerfile | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/stacks/peerdb-server.Dockerfile b/stacks/peerdb-server.Dockerfile index ae918a6b6f..c3b10c6ac1 100644 --- a/stacks/peerdb-server.Dockerfile +++ b/stacks/peerdb-server.Dockerfile @@ -1,14 +1,16 @@ # syntax=docker/dockerfile:1@sha256:db1ff77fb637a5955317c7a3a62540196396d565f3dd5742e76dddbb6d75c4c5 -FROM lukemathwalker/cargo-chef:latest-rust-alpine3.20@sha256:1c79ba91752ef8df8085c1477d9981550af94f619372536327056f72c709f977 as chef + +FROM lukemathwalker/cargo-chef:latest-rust-alpine3.20@sha256:1c79ba91752ef8df8085c1477d9981550af94f619372536327056f72c709f977 AS chef + WORKDIR /root -FROM chef as planner +FROM chef AS planner COPY nexus nexus WORKDIR /root/nexus RUN cargo chef prepare --recipe-path recipe.json -FROM chef as builder +FROM chef AS builder ENV OPENSSL_STATIC=1 RUN apk add --no-cache build-base pkgconfig curl unzip openssl-dev openssl-libs-static WORKDIR /root/nexus diff --git a/stacks/peerdb-ui.Dockerfile b/stacks/peerdb-ui.Dockerfile index b0fd544bc1..701bac74e0 100644 --- a/stacks/peerdb-ui.Dockerfile +++ b/stacks/peerdb-ui.Dockerfile @@ -6,7 +6,7 @@ ENV NPM_CONFIG_UPDATE_NOTIFIER=false RUN apk add --no-cache openssl && \ mkdir /app && \ chown -R node:node /app -ENV NEXT_TELEMETRY_DISABLED 1 +ENV NEXT_TELEMETRY_DISABLED=1 USER node WORKDIR /app @@ -19,7 +19,7 @@ RUN npm run build # Builder stage FROM base AS runner -ENV NODE_ENV production +ENV NODE_ENV=production COPY --from=builder /app/public ./public @@ -31,9 +31,9 @@ COPY --chown=node:node stacks/ui/ui-entrypoint.sh /app/entrypoint.sh EXPOSE 3000 -ENV PORT 3000 +ENV PORT=3000 # set hostname to localhost -ENV HOSTNAME "0.0.0.0" +ENV HOSTNAME=0.0.0.0 ARG PEERDB_VERSION_SHA_SHORT ENV PEERDB_VERSION_SHA_SHORT=${PEERDB_VERSION_SHA_SHORT}