Skip to content

Commit e0d30db

Browse files
Fix release container build, bump image deps (#446)
Added the missing internal directory for the release Dockerfile, which was causing the build to fail. I believe the image deps weren't being updated because of the invalid directory in the dependabot config, which we removed awhile ago. Signed-off-by: Hayden B <[email protected]>
1 parent cd3415f commit e0d30db

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ updates:
3333
- package-ecosystem: "docker"
3434
directories:
3535
- "/"
36-
- "/protoc-builder"
3736
schedule:
3837
interval: "weekly"
3938
groups:

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
FROM --platform=$BUILDPLATFORM golang:1.24.4@sha256:10c131810f80a4802c49cab0961bbe18a16f4bb2fb99ef16deaa23e4246fc817 AS builder
16+
FROM --platform=$BUILDPLATFORM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder
1717
ARG TARGETOS
1818
ARG TARGETARCH
1919
ENV APP_ROOT=/opt/app-root
@@ -35,7 +35,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -ldflags "${SER
3535
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "${SERVER_LDFLAGS}" -o rekor-server_debug ./cmd/rekor-server
3636

3737
# Multi-stage deployment build
38-
FROM golang:1.24.4@sha256:10c131810f80a4802c49cab0961bbe18a16f4bb2fb99ef16deaa23e4246fc817 AS deploy
38+
FROM golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS deploy
3939
# Retrieve the binary from the previous stage
4040
COPY --from=builder /opt/app-root/src/rekor-server /usr/local/bin/rekor-server
4141
COPY --from=builder /usr/bin/sleep /usr/bin/sleep
@@ -51,8 +51,8 @@ ENV GOPATH=$APP_ROOT
5151
# Create a directory where 'go install' may install the cross-compiled binary,
5252
# if the build and target platform differ.
5353
RUN mkdir -p /opt/app-root/bin/${TARGETOS}_${TARGETARCH}
54-
# dlv v1.24.2
55-
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go install github.com/go-delve/delve/cmd/dlv@f0cc62bfcaa18b9f2cd01cebd818fad537ee93ec
54+
# dlv v1.25.1
55+
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go install github.com/go-delve/delve/cmd/dlv@f498dc8c5a8ad01334a9d782893c10bd0addb510
5656

5757
# Multi-stage debugger build
5858
FROM deploy AS debug

Dockerfile.emulator_init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:527.0.0-stable@sha256:bc6049ab0939e1feb9a53729b3b7289d85d8e73d76bb174d07e0fb2518eff1aa
16+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:534.0.0-stable@sha256:b6dac3dd5e045e61dc15e2b51bc78b3e45f1e4c8cbb2b279db9bed4ff17ca01a
1717

1818
ADD ./config/emulator_init.sh /root/
1919
RUN chmod +x /root/emulator_init.sh

Dockerfile.golangci-lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM golangci/golangci-lint:v2.1.6@sha256:568ee1c1c53493575fa9494e280e579ac9ca865787bafe4df3023ae59ecf299b AS golangci-lint
1+
FROM golangci/golangci-lint:v2.3.1@sha256:faf53744e380715d05d53765e2aa7602e7f04c4c8112fd20c9112ce5f77b6c01 AS golangci-lint
22

33
ENV FOO=BAR

Dockerfile.protobuf-specs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# A dockerfile to keep the protobuf-specs based builder up to date, we don't actually bulid from here
2-
FROM ghcr.io/sigstore/protobuf-specs-service-builder:0.4.3@sha256:8a73049de5dc158d74a664a849bc27b9858a184ccae3ba5acf1f012a8486acf6
2+
FROM ghcr.io/sigstore/protobuf-specs-service-builder:0.5.0@sha256:a999950276fbdecd1388d2933398192acaa9b59b2561f090a7b0be2514eb3256

Dockerfile.release

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515

1616
# Debian 12 (Bookworm) image to build binary for distroless/static-debian12
17-
FROM --platform=$BUILDPLATFORM golang:1.24.4-bookworm@sha256:ee7ff13d239350cc9b962c1bf371a60f3c32ee00eaaf0d0f0489713a87e51a67 AS builder
17+
FROM --platform=$BUILDPLATFORM golang:1.24.6-bookworm@sha256:2679c15c940573aded505b2f2fbbd4e718b5172327aae3ab9f43a10a5c700dfc AS builder
1818
ARG TARGETOS
1919
ARG TARGETARCH
2020
ENV APP_ROOT=/opt/app-root
@@ -27,13 +27,14 @@ RUN go mod download
2727
# Add source code
2828
ADD ./cmd/ $APP_ROOT/src/cmd/
2929
ADD ./pkg/ $APP_ROOT/src/pkg/
30+
ADD ./internal/ $APP_ROOT/src/internal/
3031

3132
ARG SERVER_LDFLAGS
3233
# Build server for deployment. Build without cgo since distroless/static-debian12 doesn't include lib/cgo
3334
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -ldflags "${SERVER_LDFLAGS}" ./cmd/rekor-server
3435

3536
# Multi-stage deployment build
36-
FROM gcr.io/distroless/static-debian12:nonroot@sha256:188ddfb9e497f861177352057cb21913d840ecae6c843d39e00d44fa64daa51c AS deploy
37+
FROM gcr.io/distroless/static-debian12:nonroot@sha256:cdf4daaf154e3e27cfffc799c16f343a384228f38646928a1513d925f473cb46 AS deploy
3738
# Retrieve the binary from the previous stage
3839
COPY --from=builder /opt/app-root/src/rekor-server /usr/local/bin/rekor-server
3940
# Set the binary as the entrypoint of the container

0 commit comments

Comments
 (0)