Skip to content

Commit

Permalink
Specify platform everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
RebeccaMahany committed May 9, 2023
1 parent bac2308 commit dd82fcf
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Note that multistage builds can leverage the tag applied (at build
# time) to this container

FROM golang:1.20 AS golauncherbuild
FROM --platform=linux/amd64 golang:1.20 AS golauncherbuild
LABEL maintainer="engineering@kolide.co"

# fake data or not?
Expand All @@ -31,7 +31,7 @@ RUN cd launcher && git checkout "${gitver}"
# Build!
RUN cd launcher && make deps
RUN cd launcher && make all
RUN cd launcher && GO111MODULE=on go run cmd/make/make.go -targets=launcher -linkstamp $FAKE
RUN cd launcher && GO111MODULE=on go run cmd/make/make.go -targets=launcher -linkstamp $FAKE -arch amd64

# Install
RUN mkdir -p /usr/local/kolide/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/centos7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG FAKE
FROM launcher${FAKE}-build as stage1

FROM centos:centos7
FROM --platform=linux/amd64 centos:centos7
LABEL maintainer="engineering@kolide.co"

COPY --from=stage1 /usr/local/kolide/bin/* /usr/local/kolide/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/distroless/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG FAKE
FROM launcher${FAKE}-build as stage1

FROM gcr.io/distroless/base
FROM --platform=linux/amd64 gcr.io/distroless/base
LABEL maintainer="engineering@kolide.co"

# RUN mkdir -p /usr/local/kolide/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG FAKE
FROM launcher${FAKE}-build as stage1

FROM ubuntu:16.04
FROM --platform=linux/amd64 ubuntu:16.04
LABEL maintainer="engineering@kolide.co"

COPY --from=stage1 /usr/local/kolide/bin/* /usr/local/kolide/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG FAKE
FROM launcher${FAKE}-build as stage1

FROM ubuntu:18.04
FROM --platform=linux/amd64 ubuntu:18.04
LABEL maintainer="engineering@kolide.co"

COPY --from=stage1 /usr/local/kolide/bin/* /usr/local/kolide/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG FAKE
FROM launcher${FAKE}-build as stage1

FROM ubuntu:20.04
FROM --platform=linux/amd64 ubuntu:20.04
LABEL maintainer="engineering@kolide.co"

COPY --from=stage1 /usr/local/kolide/bin/* /usr/local/kolide/bin/
Expand Down

0 comments on commit dd82fcf

Please sign in to comment.