Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix architecture on ARM images #284

Merged
merged 1 commit into from
Aug 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile.arm32v6
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ COPY . .
RUN make build
RUN touch /config.yaml

FROM gcr.io/distroless/static
FROM arm32v6/alpine
WORKDIR /pomerium
COPY --from=multiarch/qemu-user-static /usr/bin/qemu-arm-static /usr/bin/
RUN apk --no-cache add ca-certificates
COPY --from=build /go/src/github.com/pomerium/pomerium/bin/* /bin/
COPY --from=build /config.yaml /pomerium/config.yaml
ENTRYPOINT [ "/bin/pomerium" ]
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.arm32v7
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ COPY . .
RUN make build
RUN touch /config.yaml

FROM gcr.io/distroless/static
FROM arm32v7/alpine
WORKDIR /pomerium
COPY --from=multiarch/qemu-user-static /usr/bin/qemu-arm-static /usr/bin/
RUN apk --no-cache add ca-certificates
COPY --from=build /go/src/github.com/pomerium/pomerium/bin/* /bin/
COPY --from=build /config.yaml /pomerium/config.yaml
ENTRYPOINT [ "/bin/pomerium" ]
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.arm64v8
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ COPY . .
RUN make build
RUN touch /config.yaml

FROM gcr.io/distroless/static
FROM arm64v8/alpine
WORKDIR /pomerium
COPY --from=multiarch/qemu-user-static /usr/bin/qemu-aarch64-static /usr/bin/
RUN apk --no-cache add ca-certificates
COPY --from=build /go/src/github.com/pomerium/pomerium/bin/* /bin/
COPY --from=build /config.yaml /pomerium/config.yaml
ENTRYPOINT [ "/bin/pomerium" ]
Expand Down
4 changes: 4 additions & 0 deletions hooks/post_checkout
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

apt-get update
apt-get install -y curl binfmt-support
3 changes: 3 additions & 0 deletions hooks/pre_build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker run --rm --privileged multiarch/qemu-user-static --reset