diff --git a/e2e_cleanup/go.mod b/e2e_cleanup/go.mod index 6fc5bcc146..e83a9ab49b 100644 --- a/e2e_cleanup/go.mod +++ b/e2e_cleanup/go.mod @@ -1,6 +1,6 @@ module github.com/PeerDB-io/peer-flow-cleanup -go 1.22.2 +go 1.22.3 require ( cloud.google.com/go/bigquery v1.59.1 diff --git a/flow/go.mod b/flow/go.mod index d6d94975d4..a96851e6e1 100644 --- a/flow/go.mod +++ b/flow/go.mod @@ -1,6 +1,6 @@ module github.com/PeerDB-io/peer-flow -go 1.22.2 +go 1.22.3 require ( cloud.google.com/go v0.112.2 diff --git a/stacks/flow.Dockerfile b/stacks/flow.Dockerfile index f991421c40..a8ac567d86 100644 --- a/stacks/flow.Dockerfile +++ b/stacks/flow.Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.2 -FROM golang:1.22-bookworm AS builder -RUN apt-get update && apt-get install -y gcc libgeos-dev +FROM golang:1.22-alpine AS builder +RUN apk add --no-cache gcc geos-dev musl-dev WORKDIR /root/flow # first copy only go.mod and go.sum to cache dependencies @@ -18,8 +18,8 @@ WORKDIR /root/flow ENV CGO_ENABLED=1 RUN go build -ldflags="-s -w" -o /root/peer-flow -FROM debian:bookworm-slim AS flow-base -RUN apt-get update && apt-get install -y ca-certificates libgeos-c1v5 +FROM alpine:3.19 AS flow-base +RUN apk add --no-cache ca-certificates geos WORKDIR /root COPY --from=builder /root/peer-flow . diff --git a/stacks/peerdb-server.Dockerfile b/stacks/peerdb-server.Dockerfile index 1dbfb77b37..63c78624e9 100644 --- a/stacks/peerdb-server.Dockerfile +++ b/stacks/peerdb-server.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM lukemathwalker/cargo-chef:latest-rust-1.77-slim-bookworm as chef +FROM lukemathwalker/cargo-chef:latest-rust-alpine3.19 as chef WORKDIR /root FROM chef as planner @@ -9,10 +9,7 @@ WORKDIR /root/nexus RUN cargo chef prepare --recipe-path recipe.json FROM chef as builder -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive \ - apt-get install --assume-yes --no-install-recommends \ - build-essential pkg-config curl unzip +RUN apk add --no-cache build-base pkgconfig curl unzip WORKDIR /root/nexus COPY scripts /root/scripts RUN /root/scripts/install-protobuf.sh @@ -24,9 +21,8 @@ COPY protos /root/protos WORKDIR /root/nexus RUN CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse cargo build --release --bin peerdb-server -FROM debian:bookworm-slim -RUN apt-get update && \ - apt-get install -y ca-certificates postgresql-client curl iputils-ping && \ +FROM alpine:3.19 +RUN apk add --no-cache ca-certificates postgresql-client curl iputils && \ mkdir -p /var/log/peerdb WORKDIR /root COPY --from=builder /root/nexus/target/release/peerdb-server . diff --git a/stacks/peerdb-ui.Dockerfile b/stacks/peerdb-ui.Dockerfile index 8630beb1dd..6d8ea2c5cc 100644 --- a/stacks/peerdb-ui.Dockerfile +++ b/stacks/peerdb-ui.Dockerfile @@ -1,10 +1,9 @@ # syntax=docker/dockerfile:1.2 # Base stage -FROM node:20-bookworm-slim AS base +FROM node:20-alpine AS base ENV NPM_CONFIG_UPDATE_NOTIFIER=false -RUN apt-get update && \ - apt-get install -y openssl && \ +RUN apk add --no-cache openssl && \ mkdir /app && \ chown -R node:node /app ENV NEXT_TELEMETRY_DISABLED 1 @@ -13,7 +12,7 @@ WORKDIR /app # Dependencies stage FROM base AS builder -COPY --chown=node:node ui/package.json ui/package-lock.json . +COPY --chown=node:node ui/package.json ui/package-lock.json ./ RUN npm ci COPY --chown=node:node ui/ .