Skip to content

Commit

Permalink
base: rebuild base image
Browse files Browse the repository at this point in the history
we need a container which contains storj-up with the latest fixes (like 150ae30)

Change-Id: I9aac55f1fffd503d137ee89177a7f24ba4cf3ac8
  • Loading branch information
elek committed May 9, 2024
1 parent 9c6bb29 commit 0a4c360
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion base.last
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240228-1
20240509-1
2 changes: 1 addition & 1 deletion pkg/files/docker/base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$TARGETPLATFORM golang:1.20 AS storjup
FROM --platform=$TARGETPLATFORM golang:1.22 AS storjup
COPY . /go/storj-up
WORKDIR /go/storj-up
RUN --mount=type=cache,target=/root/.cache/go-build \
Expand Down
2 changes: 1 addition & 1 deletion pkg/files/docker/edge.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:20240228-1 AS final
FROM img.dev.storj.io/storjup/base:20240509-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

Expand Down
2 changes: 1 addition & 1 deletion pkg/files/docker/storj.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \
-X storj.io/common/version.buildTimestamp=0" \
./cmd/storagenode/...

FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/base:20240228-1 AS final
FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/base:20240509-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
Expand Down
4 changes: 1 addition & 3 deletions pkg/files/docker/storjscan.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,5 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \
go install ./cmd/...
RUN go install github.com/elek/cethacea@main

FROM img.dev.storj.io/storjup/base:20240228-1 AS final
FROM img.dev.storj.io/storjup/base:20240509-1 AS final
COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin


0 comments on commit 0a4c360

Please sign in to comment.