diff --git a/base.last b/base.last index ce03c49..8b0f3ca 100644 --- a/base.last +++ b/base.last @@ -1 +1 @@ -20230825-1 \ No newline at end of file +20231012-1 \ No newline at end of file diff --git a/pkg/files/docker/base.Dockerfile b/pkg/files/docker/base.Dockerfile index 226105a..3e23c53 100644 --- a/pkg/files/docker/base.Dockerfile +++ b/pkg/files/docker/base.Dockerfile @@ -7,7 +7,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM --platform=$TARGETPLATFORM ubuntu:22.04 AS final RUN apt-get update -RUN apt-get -y install iproute2 ca-certificates +RUN apt-get -y install iproute2 ca-certificates curl jq unzip RUN useradd storj --uid 1000 -d /var/lib/storj && \ mkdir -p /var/lib/storj/shared && \ mkdir -p /var/lib/storj/go/bin && \ diff --git a/pkg/files/docker/edge.Dockerfile b/pkg/files/docker/edge.Dockerfile index fd7fc74..df7877d 100644 --- a/pkg/files/docker/edge.Dockerfile +++ b/pkg/files/docker/edge.Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.3 ARG TYPE ARG SOURCE -FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20230616-1 AS base +FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20230627-1 AS base FROM base AS commit ARG BRANCH @@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \ --mount=type=cache,target=/var/lib/storj/.cache/go-build,mode=777,uid=1000 \ go install ./cmd/... -FROM img.dev.storj.io/storjup/base:20230825-1 AS final +FROM img.dev.storj.io/storjup/base:20231012-1 AS final COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin COPY --from=binaries /var/lib/storj/gateway-mt/pkg/linksharing/web /var/lib/storj/pkg/linksharing/web diff --git a/pkg/files/docker/storj.Dockerfile b/pkg/files/docker/storj.Dockerfile index 35ea2ad..fc588d6 100644 --- a/pkg/files/docker/storj.Dockerfile +++ b/pkg/files/docker/storj.Dockerfile @@ -42,7 +42,7 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \ --mount=type=cache,target=/var/lib/storj/.cache/go-build,mode=777,uid=1000 \ go install ./cmd/... -FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/base:20230825-1 AS final +FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/base:20231012-1 AS final ENV STORJ_ADMIN_STATIC_DIR=/var/lib/storj/storj/satellite/admin/ui/build ENV STORJ_CONSOLE_STATIC_DIR=/var/lib/storj/storj/web/satellite/ ENV STORJ_MAIL_TEMPLATE_PATH=/var/lib/storj/storj/web/satellite/static/emails diff --git a/pkg/files/docker/storjscan.Dockerfile b/pkg/files/docker/storjscan.Dockerfile new file mode 100644 index 0000000..9db088a --- /dev/null +++ b/pkg/files/docker/storjscan.Dockerfile @@ -0,0 +1,40 @@ +# syntax=docker/dockerfile:1.3 +ARG TYPE +ARG SOURCE +FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/build:20230627-1 AS base + +FROM base AS commit +ARG BRANCH +ARG COMMIT +RUN git clone https://github.com/storj/storjscan.git --branch ${BRANCH} +RUN cd storjscan && git reset --hard ${COMMIT} +WORKDIR storjscan + +FROM base AS branch +ARG BRANCH +RUN git clone https://github.com/storj/storjscan.git --depth=1 --branch ${BRANCH} +WORKDIR storjscan + +FROM ${SOURCE} AS github + +FROM base AS gerrit +ARG REF +RUN git clone https://github.com/storj/storjscan.git +WORKDIR storjscan +RUN git fetch https://review.dev.storj.io/storj/storjscan ${REF} && git checkout FETCH_HEAD + +FROM base AS local +ARG PATH +WORKDIR /var/lib/storj/storjscan +COPY --chown=storj ${PATH} . + +FROM --platform=$TARGETPLATFORM ${TYPE} AS binaries +RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \ + --mount=type=cache,target=/var/lib/storj/.cache/go-build,mode=777,uid=1000 \ + go install ./cmd/... +RUN go install github.com/elek/cethacea@main + +FROM img.dev.storj.io/storjup/base:20231012-1 AS final +COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin + +