Skip to content

Add i386 arch support #576

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

Merged
merged 4 commits into from
Nov 5, 2017
Merged

Add i386 arch support #576

merged 4 commits into from
Nov 5, 2017

Conversation

SimenB
Copy link
Member

@SimenB SimenB commented Nov 4, 2017

Fixes #574. I'm pretty sure this is correct, but not 100%. Wheezy not included because of #567.

Diff for stackbrew:

diff --git i/library/node w/library/node
index 1c45afc..68efc55 100644
--- i/library/node
+++ w/library/node
@@ -4,122 +4,122 @@ Maintainers: The Node.js Docker Team <https://github.com/nodejs/docker-node> (@n
 GitRepo: https://github.com/nodejs/docker-node.git
 
 Tags: 9.0.0, 9.0, 9, latest
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 9.0
 
 Tags: 9.0.0-alpine, 9.0-alpine, 9-alpine, alpine
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
 GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0/alpine
 
 Tags: 9.0.0-onbuild, 9.0-onbuild, 9-onbuild, onbuild
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 9.0/slim
 
 Tags: 9.0.0-stretch, 9.0-stretch, 9-stretch, stretch
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 9.0/stretch
 
 Tags: 9.0.0-wheezy, 9.0-wheezy, 9-wheezy, wheezy
-Architectures: amd64
+Architectures: amd64, i386
 GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0/wheezy
 
 Tags: 8.9.0, 8.9, 8, carbon
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 8.9
 
 Tags: 8.9.0-alpine, 8.9-alpine, 8-alpine, carbon-alpine
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
 GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9/alpine
 
 Tags: 8.9.0-onbuild, 8.9-onbuild, 8-onbuild, carbon-onbuild
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 8.9/slim
 
 Tags: 8.9.0-stretch, 8.9-stretch, 8-stretch, carbon-stretch
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 8.9/stretch
 
 Tags: 8.9.0-wheezy, 8.9-wheezy, 8-wheezy, carbon-wheezy
-Architectures: amd64
+Architectures: amd64, i386
 GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9/wheezy
 
 Tags: 6.11.5, 6.11, 6, boron
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 222c645bfa57e415d57fc4ac2088262c8c3cef70
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 6.11
 
 Tags: 6.11.5-alpine, 6.11-alpine, 6-alpine, boron-alpine
-Architectures: amd64
+Architectures: amd64, i386
 GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 6.11/alpine
 
 Tags: 6.11.5-onbuild, 6.11-onbuild, 6-onbuild, boron-onbuild
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 6.11/slim
 
 Tags: 6.11.5-stretch, 6.11-stretch, 6-stretch, boron-stretch
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 6.11/stretch
 
 Tags: 6.11.5-wheezy, 6.11-wheezy, 6-wheezy, boron-wheezy
-Architectures: amd64
+Architectures: amd64, i386
 GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 6.11/wheezy
 
 Tags: 4.8.5, 4.8, 4, argon
-Architectures: amd64, ppc64le, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 4.8
 
 Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine
-Architectures: amd64
+Architectures: amd64, i386
 GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 4.8/alpine
 
 Tags: 4.8.5-onbuild, 4.8-onbuild, 4-onbuild, argon-onbuild
-Architectures: amd64, ppc64le, arm64v8, arm32v7
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 4.8/slim
 
 Tags: 4.8.5-stretch, 4.8-stretch, 4-stretch, argon-stretch
-Architectures: amd64, ppc64le, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
+GitCommit: d3557702c9f55d3180ad50788a05f153dc99ac1a
 Directory: 4.8/stretch
 
 Tags: 4.8.5-wheezy, 4.8-wheezy, 4-wheezy, argon-wheezy
-Architectures: amd64
+Architectures: amd64, i386
 GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 4.8/wheezy

/cc @tianon

@SimenB SimenB requested a review from a team November 4, 2017 19:46
@tianon
Copy link
Contributor

tianon commented Nov 4, 2017

 Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine
-Architectures: amd64
+Architectures: amd64, i386

These won't do 😉

@SimenB
Copy link
Member Author

SimenB commented Nov 4, 2017

Not for any alpines, or just alpine 3.4 (meaning node 4 and 6)?

@tianon
Copy link
Contributor

tianon commented Nov 4, 2017

Diffs look OK, just need to remove alpine:3.4 versions, yep. 👍

@SimenB
Copy link
Member Author

SimenB commented Nov 4, 2017

Diff:

diff --git i/library/node w/library/node
index 1c45afca..3f209ca7 100644
--- i/library/node
+++ w/library/node
@@ -4,28 +4,28 @@ Maintainers: The Node.js Docker Team <https://github.com/nodejs/docker-node> (@n
 GitRepo: https://github.com/nodejs/docker-node.git
 
 Tags: 9.0.0, 9.0, 9, latest
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 9.0
 
 Tags: 9.0.0-alpine, 9.0-alpine, 9-alpine, alpine
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
 GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0/alpine
 
 Tags: 9.0.0-onbuild, 9.0-onbuild, 9-onbuild, onbuild
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 9.0/slim
 
 Tags: 9.0.0-stretch, 9.0-stretch, 9-stretch, stretch
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 9.0/stretch
 
 Tags: 9.0.0-wheezy, 9.0-wheezy, 9-wheezy, wheezy
@@ -34,28 +34,28 @@ GitCommit: 092306f6d035d53d7f087a1a671915aabc946c6f
 Directory: 9.0/wheezy
 
 Tags: 8.9.0, 8.9, 8, carbon
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 8.9
 
 Tags: 8.9.0-alpine, 8.9-alpine, 8-alpine, carbon-alpine
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
 GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9/alpine
 
 Tags: 8.9.0-onbuild, 8.9-onbuild, 8-onbuild, carbon-onbuild
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 8.9/slim
 
 Tags: 8.9.0-stretch, 8.9-stretch, 8-stretch, carbon-stretch
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 8.9/stretch
 
 Tags: 8.9.0-wheezy, 8.9-wheezy, 8-wheezy, carbon-wheezy
@@ -64,8 +64,8 @@ GitCommit: 39a5c8a3be7fff2ddc67a2e72919d0a3841b235f
 Directory: 8.9/wheezy
 
 Tags: 6.11.5, 6.11, 6, boron
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 222c645bfa57e415d57fc4ac2088262c8c3cef70
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: 1ce9e890c6a93f64e1a5df148960d21206cf9fcd
 Directory: 6.11
 
 Tags: 6.11.5-alpine, 6.11-alpine, 6-alpine, boron-alpine
@@ -74,18 +74,18 @@ GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 6.11/alpine
 
 Tags: 6.11.5-onbuild, 6.11-onbuild, 6-onbuild, boron-onbuild
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 6.11/slim
 
 Tags: 6.11.5-stretch, 6.11-stretch, 6-stretch, boron-stretch
-Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 6.11/stretch
 
 Tags: 6.11.5-wheezy, 6.11-wheezy, 6-wheezy, boron-wheezy
@@ -94,8 +94,8 @@ GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 6.11/wheezy
 
 Tags: 4.8.5, 4.8, 4, argon
-Architectures: amd64, ppc64le, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
+GitCommit: 1ce9e890c6a93f64e1a5df148960d21206cf9fcd
 Directory: 4.8
 
 Tags: 4.8.5-alpine, 4.8-alpine, 4-alpine, argon-alpine
@@ -104,18 +104,18 @@ GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
 Directory: 4.8/alpine
 
 Tags: 4.8.5-onbuild, 4.8-onbuild, 4-onbuild, argon-onbuild
-Architectures: amd64, ppc64le, arm64v8, arm32v7
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
 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
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 4.8/slim
 
 Tags: 4.8.5-stretch, 4.8-stretch, 4-stretch, argon-stretch
-Architectures: amd64, ppc64le, arm64v8, arm32v7
-GitCommit: 94a739297fcd60ef969b478d4e581a6d8299a94d
+Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
+GitCommit: bf48e44dca420c3e68f865b5f6697ed74d80ce9d
 Directory: 4.8/stretch
 
 Tags: 4.8.5-wheezy, 4.8-wheezy, 4-wheezy, argon-wheezy

chorrell

This comment was marked as off-topic.

@SimenB SimenB merged commit 001cfa3 into nodejs:master Nov 5, 2017
@SimenB SimenB deleted the i386 branch November 5, 2017 15:41
@SimenB
Copy link
Member Author

SimenB commented Nov 5, 2017

@PeterDaveHello
Copy link
Member

Awesome 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants