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

Add alpine to multi-arch support #569

Merged
merged 4 commits into from Nov 1, 2017

Conversation

Projects
None yet
3 participants
@mikesir87
Copy link
Contributor

mikesir87 commented Nov 1, 2017

Resolves #568

@SimenB

This comment has been minimized.

Copy link
Member

SimenB commented Nov 1, 2017

Can you run ./generate-stackbrew-library.sh and paste the output here?

@SimenB

This comment has been minimized.

Copy link
Member

SimenB commented Nov 1, 2017

@mikesir87

This comment has been minimized.

Copy link
Contributor

mikesir87 commented Nov 1, 2017

Just pushed the 4.8 update (didn't see that file). Here's the output from ./generate-stackbrew-library.sh

# this file is generated via https://github.com/nodejs/docker-node/blob/092306f6d035d53d7f087a1a671915aabc946c6f/generate-stackbrew-library.sh

Maintainers: The Node.js Docker Team <https://github.com/nodejs/docker-node> (@nodejs)
GitRepo: https://github.com/nodejs/docker-node.git

Tags: 9.0.0, 9.0, 9, latest
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0

Tags: 9.0.0-alpine, 9.0-alpine, 9-alpine, alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/alpine

Tags: 9.0.0-onbuild, 9.0-onbuild, 9-onbuild, onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/onbuild

Tags: 9.0.0-slim, 9.0-slim, 9-slim, slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/slim

Tags: 9.0.0-stretch, 9.0-stretch, 9-stretch, stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/stretch

Tags: 9.0.0-wheezy, 9.0-wheezy, 9-wheezy, wheezy
Architectures: amd64
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/wheezy

Tags: 8.9.0, 8.9, 8, carbon
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9

Tags: 8.9.0-alpine, 8.9-alpine, 8-alpine, carbon-alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/alpine

Tags: 8.9.0-onbuild, 8.9-onbuild, 8-onbuild, carbon-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/onbuild

Tags: 8.9.0-slim, 8.9-slim, 8-slim, carbon-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/slim

Tags: 8.9.0-stretch, 8.9-stretch, 8-stretch, carbon-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/stretch

Tags: 8.9.0-wheezy, 8.9-wheezy, 8-wheezy, carbon-wheezy
Architectures: amd64
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/wheezy

Tags: 6.11.5, 6.11, 6, boron
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11

Tags: 6.11.5-alpine, 6.11-alpine, 6-alpine, boron-alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/alpine

Tags: 6.11.5-onbuild, 6.11-onbuild, 6-onbuild, boron-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 7701eea6fe125530894b3e83f1e9d385e9ee509f
Directory: 6.11/onbuild

Tags: 6.11.5-slim, 6.11-slim, 6-slim, boron-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/slim

Tags: 6.11.5-stretch, 6.11-stretch, 6-stretch, boron-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/stretch

Tags: 6.11.5-wheezy, 6.11-wheezy, 6-wheezy, boron-wheezy
Architectures: amd64
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/wheezy

Tags: 4.8.5, 4.8, 4, argon
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 0954065aee66693935d3afb0b28d47bd96266301
Directory: 4.8

Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/alpine

Tags: 4.8.5-onbuild, 4.8-onbuild, 4-onbuild, argon-onbuild
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 7701eea6fe125530894b3e83f1e9d385e9ee509f
Directory: 4.8/onbuild

Tags: 4.8.5-slim, 4.8-slim, 4-slim, argon-slim
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/slim

Tags: 4.8.5-stretch, 4.8-stretch, 4-stretch, argon-stretch
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/stretch

Tags: 4.8.5-wheezy, 4.8-wheezy, 4-wheezy, argon-wheezy
Architectures: amd64
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/wheezy
@SimenB

This comment has been minimized.

Copy link
Member

SimenB commented Nov 1, 2017

@tianon Could you please verify that the output above matches what's expected? 🙂

Diff vs docker-library/official-images#3655

diff --git i/library/node w/library/node
index a7ac2d7..91037f1 100644
--- i/library/node
+++ w/library/node
@@ -10,7 +9,7 @@ GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0
 
 Tags: 9.0.0-alpine, 9.0-alpine, 9-alpine, alpine
-Architectures: amd64
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
 GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0/alpine
 
@@ -40,7 +39,7 @@ GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9
 
 Tags: 8.9.0-alpine, 8.9-alpine, 8-alpine, carbon-alpine
-Architectures: amd64
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
 GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9/alpine
 
@@ -70,7 +69,7 @@ GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 6.11
 
 Tags: 6.11.5-alpine, 6.11-alpine, 6-alpine, boron-alpine
-Architectures: amd64
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
 GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 6.11/alpine
 
@@ -96,11 +95,11 @@ Directory: 6.11/wheezy
 
 Tags: 4.8.5, 4.8, 4, argon
 Architectures: amd64, ppc64le, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+GitCommit: 0954065aee66693935d3afb0b28d47bd96266301
 Directory: 4.8
 
 Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine
-Architectures: amd64
+Architectures: amd64, ppc64le, arm64v8, arm32v7
 GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 4.8/alpine
@tianon

This comment has been minimized.

Copy link
Contributor

tianon commented Nov 1, 2017

Yeah, just a couple notes:

  • alpine supports arm32v6, not arm32v7, so probably will need to be a new line for arm32v6 with just alpine on it
  • both node:6.11 and node:4.8 are FROM alpine:3.4, which is still amd64-only (only 3.5 and 3.6 are multiarch), so will probably need to craft custom architectures files for each of those versions just to exclude alpine multiarch for them
@mikesir87

This comment has been minimized.

Copy link
Contributor

mikesir87 commented Nov 1, 2017

Ok. I'll go ahead and make custom architectures files for for node:6.11 and node:4.8 and add a new line for arm32v6 and alpine.

@@ -1,5 +1,5 @@
bashbrew-arch variants
amd64 default,alpine,onbuild,slim,stretch,wheezy

This comment has been minimized.

@SimenB

SimenB Nov 1, 2017

Member

this should remain

This comment has been minimized.

@mikesir87

mikesir87 Nov 1, 2017

Contributor

Should it? The Dockerfile is based on alpine:3.4, which doesn't have multi-arch support.

This comment has been minimized.

@SimenB

SimenB Nov 1, 2017

Member

amd64 exists, just not others

This comment has been minimized.

@mikesir87

mikesir87 Nov 1, 2017

Contributor

Dur... brain's not firing on all cylinders! Haha... fix coming...

@@ -0,0 +1,6 @@
bashbrew-arch variants
amd64 default,onbuild,slim,stretch,wheezy

This comment has been minimized.

@SimenB

SimenB Nov 1, 2017

Member

needs alpine here

@SimenB

This comment has been minimized.

Copy link
Member

SimenB commented Nov 1, 2017

I think this now covers the feedback. Could you generate a new stackbrew for comparison? 🙂

@mikesir87

This comment has been minimized.

Copy link
Contributor

mikesir87 commented Nov 1, 2017

Sure thing! Here it is...

# this file is generated via https://github.com/nodejs/docker-node/blob/092306f6d035d53d7f087a1a671915aabc946c6f/generate-stackbrew-library.sh

Maintainers: The Node.js Docker Team <https://github.com/nodejs/docker-node> (@nodejs)
GitRepo: https://github.com/nodejs/docker-node.git

Tags: 9.0.0, 9.0, 9, latest
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0

Tags: 9.0.0-alpine, 9.0-alpine, 9-alpine, alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/alpine

Tags: 9.0.0-onbuild, 9.0-onbuild, 9-onbuild, onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/onbuild

Tags: 9.0.0-slim, 9.0-slim, 9-slim, slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/slim

Tags: 9.0.0-stretch, 9.0-stretch, 9-stretch, stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/stretch

Tags: 9.0.0-wheezy, 9.0-wheezy, 9-wheezy, wheezy
Architectures: amd64
GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
Directory: 9.0/wheezy

Tags: 8.9.0, 8.9, 8, carbon
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9

Tags: 8.9.0-alpine, 8.9-alpine, 8-alpine, carbon-alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/alpine

Tags: 8.9.0-onbuild, 8.9-onbuild, 8-onbuild, carbon-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/onbuild

Tags: 8.9.0-slim, 8.9-slim, 8-slim, carbon-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/slim

Tags: 8.9.0-stretch, 8.9-stretch, 8-stretch, carbon-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/stretch

Tags: 8.9.0-wheezy, 8.9-wheezy, 8-wheezy, carbon-wheezy
Architectures: amd64
GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
Directory: 8.9/wheezy

Tags: 6.11.5, 6.11, 6, boron
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: d5fae1082f7d7d46f04a156e45ba8cb809c915da
Directory: 6.11

Tags: 6.11.5-alpine, 6.11-alpine, 6-alpine, boron-alpine
Architectures: amd64
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/alpine

Tags: 6.11.5-onbuild, 6.11-onbuild, 6-onbuild, boron-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 7701eea6fe125530894b3e83f1e9d385e9ee509f
Directory: 6.11/onbuild

Tags: 6.11.5-slim, 6.11-slim, 6-slim, boron-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/slim

Tags: 6.11.5-stretch, 6.11-stretch, 6-stretch, boron-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/stretch

Tags: 6.11.5-wheezy, 6.11-wheezy, 6-wheezy, boron-wheezy
Architectures: amd64
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 6.11/wheezy

Tags: 4.8.5, 4.8, 4, argon
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: d5fae1082f7d7d46f04a156e45ba8cb809c915da
Directory: 4.8

Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine
Architectures: amd64
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/alpine

Tags: 4.8.5-onbuild, 4.8-onbuild, 4-onbuild, argon-onbuild
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 7701eea6fe125530894b3e83f1e9d385e9ee509f
Directory: 4.8/onbuild

Tags: 4.8.5-slim, 4.8-slim, 4-slim, argon-slim
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/slim

Tags: 4.8.5-stretch, 4.8-stretch, 4-stretch, argon-stretch
Architectures: amd64, ppc64le, arm64v8, arm32v7
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/stretch

Tags: 4.8.5-wheezy, 4.8-wheezy, 4-wheezy, argon-wheezy
Architectures: amd64
GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
Directory: 4.8/wheezy
@tianon

This comment has been minimized.

Copy link
Contributor

tianon commented Nov 1, 2017

LGTM 👍

@SimenB

This comment has been minimized.

Copy link
Member

SimenB commented Nov 1, 2017

diff --git i/library/node w/library/node
index d58ad4e..6b8ad1f 100644
--- i/library/node
+++ w/library/node
@@ -10,7 +10,7 @@ GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0
 
 Tags: 9.0.0-alpine, 9.0-alpine, 9-alpine, alpine
-Architectures: amd64
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
 GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0/alpine
 
@@ -40,7 +40,7 @@ GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9
 
 Tags: 8.9.0-alpine, 8.9-alpine, 8-alpine, carbon-alpine
-Architectures: amd64
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
 GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9/alpine
 
@@ -66,7 +66,7 @@ Directory: 8.9/wheezy
 
 Tags: 6.11.5, 6.11, 6, boron
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+GitCommit: d5fae1082f7d7d46f04a156e45ba8cb809c915da
 Directory: 6.11
 
 Tags: 6.11.5-alpine, 6.11-alpine, 6-alpine, boron-alpine
@@ -96,7 +96,7 @@ Directory: 6.11/wheezy
 
 Tags: 4.8.5, 4.8, 4, argon
 Architectures: amd64, ppc64le, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+GitCommit: d5fae1082f7d7d46f04a156e45ba8cb809c915da
 Directory: 4.8
 
 Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine

So diff is that node-alpine@8 and node-alpine@9 gets builds for ppc64le, s390x, arm64v8, arm32v6. Cool!

@SimenB

SimenB approved these changes Nov 1, 2017

@SimenB SimenB merged commit 222c645 into nodejs:master Nov 1, 2017

1 check was pending

Travis CI via nodejs-github-bot build in progress
Details
@mikesir87

This comment has been minimized.

Copy link
Contributor

mikesir87 commented Nov 1, 2017

Sweet! Thanks @SimenB and @tianon for the assist!

@mikesir87 mikesir87 deleted the mikesir87:multi-arch-support branch Nov 1, 2017

@SimenB

This comment has been minimized.

Copy link
Member

SimenB commented Nov 1, 2017

@mikesir87 mikesir87 referenced this pull request Nov 1, 2017

Closed

Node Alpine for armv7 #536

@SimenB SimenB referenced this pull request Nov 4, 2017

Closed

Status of i386 docker images #574

@SimenB SimenB referenced this pull request Mar 31, 2018

Closed

arm32v7 image availability #677

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment