Skip to content

Commit

Permalink
Merge branch 'main' into fix-parallel-lsn
Browse files Browse the repository at this point in the history
  • Loading branch information
serprex authored May 10, 2024
2 parents 7113344 + 0116f5e commit 6316d6e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion e2e_cleanup/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion flow/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions stacks/flow.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 .

Expand Down
12 changes: 4 additions & 8 deletions stacks/peerdb-server.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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 .
Expand Down
7 changes: 3 additions & 4 deletions stacks/peerdb-ui.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/ .

Expand Down

0 comments on commit 6316d6e

Please sign in to comment.