Skip to content

Commit

Permalink
Merge pull request #73 from srl-labs/chore/specify-platform-in-final-…
Browse files Browse the repository at this point in the history
…images

chore: specify platform in final images now that i have not x86 :p
  • Loading branch information
carlmontanari authored Nov 21, 2023
2 parents 7fb1713 + 5959ca9 commit fbaeaea
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .develop/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bookworm
FROM --platform=linux/amd64 golang:1.21-bookworm

RUN set -x && apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y \
ca-certificates wget jq procps curl vim inetutils-ping binutils && \
Expand Down
2 changes: 1 addition & 1 deletion .develop/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars:
LAUNCHER_IMAGE: ${REGISTRY}/${CLABERNETES}-launcher
CLABVERTER_IMAGE: ${REGISTRY}/clabverter

# always build w/ 0.0.0 -- overriden for actual releases by release profile. for "normal" builds
# always build w/ 0.0.0 -- overridden for actual releases by release profile. for "normal" builds
# (not releases) we'll do VERSION-HASH, for releases we'll just override to have version tag.
VERSION: 0.0.0
COMMIT_HASH: $(git describe --always --abbrev=8)
Expand Down
2 changes: 1 addition & 1 deletion build/clabverter.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 \
build/clabverter \
main.go

FROM gcr.io/distroless/static-debian12:nonroot
FROM --platform=linux/amd64 gcr.io/distroless/static-debian12:nonroot

WORKDIR /clabernetes
COPY --from=builder --chown=nonroot:nonroot /clabernetes/work /clabernetes/work
Expand Down
2 changes: 1 addition & 1 deletion build/launcher.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 \
build/manager \
main.go

FROM debian:bookworm-slim
FROM --platform=linux/amd64 debian:bookworm-slim

ARG CONTAINERLAB_VERSION="0.48.*"
ARG NERDCTL_VERSION="1.7.0"
Expand Down
2 changes: 1 addition & 1 deletion build/manager.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN CGO_ENABLED=0 \
build/manager \
main.go

FROM gcr.io/distroless/static-debian12:nonroot
FROM --platform=linux/amd64 gcr.io/distroless/static-debian12:nonroot

WORKDIR /clabernetes
COPY --from=builder --chown=nonroot:nonroot /clabernetes/certificates /clabernetes/certificates
Expand Down

0 comments on commit fbaeaea

Please sign in to comment.