Skip to content

Conversation

LaurentGoderre
Copy link
Member

No description provided.

@LaurentGoderre
Copy link
Member Author

The stackbrew creates this after the change

# this file is generated via https://github.com/nodejs/docker-node/blob/c3baf8491ef0967ac32ee7b20afc66a32e2c4c73/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.11.1-jessie, 9.11-jessie, 9-jessie, 9.11.1, 9.11, 9
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 5451e819b2f3039a6f8c7d3b03d494aa5385aeaa
Directory: 9/jessie

Tags: 9.11.1-alpine, 9.11-alpine, 9-alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
Directory: 9/alpine

Tags: 9.11.1-onbuild, 9.11-onbuild, 9-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
Directory: 9/onbuild

Tags: 9.11.1-slim, 9.11-slim, 9-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
Directory: 9/slim

Tags: 9.11.1-stretch, 9.11-stretch, 9-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
Directory: 9/stretch

Tags: 9.11.1-wheezy, 9.11-wheezy, 9-wheezy
Architectures: amd64
GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
Directory: 9/wheezy

Tags: 8.11.1-jessie, 8.11-jessie, 8-jessie, carbon-jessie, 8.11.1, 8.11, 8, carbon
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 5451e819b2f3039a6f8c7d3b03d494aa5385aeaa
Directory: 8/jessie

Tags: 8.11.1-alpine, 8.11-alpine, 8-alpine, carbon-alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
Directory: 8/alpine

Tags: 8.11.1-onbuild, 8.11-onbuild, 8-onbuild, carbon-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
Directory: 8/onbuild

Tags: 8.11.1-slim, 8.11-slim, 8-slim, carbon-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
Directory: 8/slim

Tags: 8.11.1-stretch, 8.11-stretch, 8-stretch, carbon-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
Directory: 8/stretch

Tags: 8.11.1-wheezy, 8.11-wheezy, 8-wheezy, carbon-wheezy
Architectures: amd64
GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
Directory: 8/wheezy

Tags: 6.14.1-jessie, 6.14-jessie, 6-jessie, boron-jessie, 6.14.1, 6.14, 6, boron
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 5451e819b2f3039a6f8c7d3b03d494aa5385aeaa
Directory: 6/jessie

Tags: 6.14.1-alpine, 6.14-alpine, 6-alpine, boron-alpine
Architectures: amd64
GitCommit: 987139fc2385fc985aaa2545f7aeeef255eced79
Directory: 6/alpine

Tags: 6.14.1-onbuild, 6.14-onbuild, 6-onbuild, boron-onbuild
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 987139fc2385fc985aaa2545f7aeeef255eced79
Directory: 6/onbuild

Tags: 6.14.1-slim, 6.14-slim, 6-slim, boron-slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 987139fc2385fc985aaa2545f7aeeef255eced79
Directory: 6/slim

Tags: 6.14.1-stretch, 6.14-stretch, 6-stretch, boron-stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 987139fc2385fc985aaa2545f7aeeef255eced79
Directory: 6/stretch

Tags: 6.14.1-wheezy, 6.14-wheezy, 6-wheezy, boron-wheezy
Architectures: amd64
GitCommit: 987139fc2385fc985aaa2545f7aeeef255eced79
Directory: 6/wheezy

Tags: 4.9.1-jessie, 4.9-jessie, 4-jessie, argon-jessie, 4.9.1, 4.9, 4, argon
Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
GitCommit: 5451e819b2f3039a6f8c7d3b03d494aa5385aeaa
Directory: 4/jessie

Tags: 4.9.1-alpine, 4.9-alpine, 4-alpine, argon-alpine
Architectures: amd64
GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
Directory: 4/alpine

Tags: 4.9.1-onbuild, 4.9-onbuild, 4-onbuild, argon-onbuild
Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
Directory: 4/onbuild

Tags: 4.9.1-slim, 4.9-slim, 4-slim, argon-slim
Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
Directory: 4/slim

Tags: 4.9.1-stretch, 4.9-stretch, 4-stretch, argon-stretch
Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
Directory: 4/stretch

Tags: 4.9.1-wheezy, 4.9-wheezy, 4-wheezy, argon-wheezy
Architectures: amd64
GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
Directory: 4/wheezy

Tags: 10.0.0-jessie, 10.0-jessie, 10-jessie, jessie, 10.0.0, 10.0, 10, latest
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 5451e819b2f3039a6f8c7d3b03d494aa5385aeaa
Directory: 10/jessie

Tags: 10.0.0-alpine, 10.0-alpine, 10-alpine, alpine
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
Directory: 10/alpine

Tags: 10.0.0-slim, 10.0-slim, 10-slim, slim
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
Directory: 10/slim

Tags: 10.0.0-stretch, 10.0-stretch, 10-stretch, stretch
Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
Directory: 10/stretch

Tags: 10.0.0-wheezy, 10.0-wheezy, 10-wheezy, wheezy
Architectures: amd64
GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
Directory: 10/wheezy

Tags: chakracore-8.11.1, chakracore-8.11, chakracore-8
Architectures: amd64
GitCommit: eca9e8f34ca78bdba691e1d5ead82840e2673705
Directory: chakracore/8

Tags: chakracore-10.0.0, chakracore-10.0, chakracore-10, chakracore
Architectures: amd64
GitCommit: f713f15abe3ff05635326ba9716b7755c9d5f1aa
Directory: chakracore/10

SimenB

This comment was marked as off-topic.

@SimenB
Copy link
Member

SimenB commented May 1, 2018

The stackbrew creates this after the change

Mind creating a diff against master and pasting that?

@SimenB
Copy link
Member

SimenB commented May 1, 2018

The diff:

diff --git i/pr w/pr
index 5c4a063..a7ec48b 100644
--- i/pr
+++ w/pr
@@ -1,12 +1,12 @@
-# this file is generated via https://github.com/nodejs/docker-node/blob/c3baf8491ef0967ac32ee7b20afc66a32e2c4c73/generate-stackbrew-library.sh
+# this file is generated via https://github.com/nodejs/docker-node/blob/64eed01a95c5672ee9426e5e6be19a39b178a103/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.11.1, 9.11, 9
+Tags: 9.11.1-jessie, 9.11-jessie, 9-jessie, 9.11.1, 9.11, 9
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
-GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
-Directory: 9
+GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
+Directory: 9/jessie
 
 Tags: 9.11.1-alpine, 9.11-alpine, 9-alpine
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
@@ -33,10 +33,10 @@ Architectures: amd64
 GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
 Directory: 9/wheezy
 
-Tags: 8.11.1, 8.11, 8, carbon
+Tags: 8.11.1-jessie, 8.11-jessie, 8-jessie, carbon-jessie, 8.11.1, 8.11, 8, carbon
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
-GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
-Directory: 8
+GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
+Directory: 8/jessie
 
 Tags: 8.11.1-alpine, 8.11-alpine, 8-alpine, carbon-alpine
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386
@@ -63,10 +63,10 @@ Architectures: amd64
 GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
 Directory: 8/wheezy
 
-Tags: 6.14.2, 6.14, 6, boron
+Tags: 6.14.2-jessie, 6.14-jessie, 6-jessie, boron-jessie, 6.14.2, 6.14, 6, boron
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
-GitCommit: bb49c321f761c333ba87b18770121651f0a3004c
-Directory: 6
+GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
+Directory: 6/jessie
 
 Tags: 6.14.2-alpine, 6.14-alpine, 6-alpine, boron-alpine
 Architectures: amd64
@@ -93,10 +93,10 @@ Architectures: amd64
 GitCommit: bb49c321f761c333ba87b18770121651f0a3004c
 Directory: 6/wheezy
 
-Tags: 4.9.1, 4.9, 4, argon
+Tags: 4.9.1-jessie, 4.9-jessie, 4-jessie, argon-jessie, 4.9.1, 4.9, 4, argon
 Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
-GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
-Directory: 4
+GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
+Directory: 4/jessie
 
 Tags: 4.9.1-alpine, 4.9-alpine, 4-alpine, argon-alpine
 Architectures: amd64
@@ -123,10 +123,10 @@ Architectures: amd64
 GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
 Directory: 4/wheezy
 
-Tags: 10.0.0, 10.0, 10, latest
+Tags: 10.0.0-jessie, 10.0-jessie, 10-jessie, jessie, 10.0.0, 10.0, 10, latest
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
-GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
-Directory: 10
+GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
+Directory: 10/jessie
 
 Tags: 10.0.0-alpine, 10.0-alpine, 10-alpine, alpine
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v6, i386

The Directory looks wrong now, what do you think?

I like having jessie in the tag, though! Sorta paves the way for #473 (although I think that's more blocked by build time than anything...)

@LaurentGoderre
Copy link
Member Author

The directory is good, there is no longer a root Dockerfile, they are all in subdirs

SimenB

This comment was marked as off-topic.

@SimenB
Copy link
Member

SimenB commented May 1, 2018

Ah, I missed the renames!

@LaurentGoderre
Copy link
Member Author

@PeterDaveHello @SimenB are you guys ok with this?

@LaurentGoderre
Copy link
Member Author

@tianon is this also consistent with other official images?

@LaurentGoderre
Copy link
Member Author

@SimenB here is the diff of changing the default variant from jessie to stretch

--- 1.log	2018-05-01 14:20:44.000000000 -0400
+++ 2.log	2018-05-01 14:20:24.000000000 -0400
@@ -3,7 +3,7 @@
 Maintainers: The Node.js Docker Team <https://github.com/nodejs/docker-node> (@nodejs)
 GitRepo: https://github.com/nodejs/docker-node.git
 
-Tags: 9.11.1-jessie, 9.11-jessie, 9-jessie, 9.11.1, 9.11, 9
+Tags: 9.11.1-jessie, 9.11-jessie, 9-jessie
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
 Directory: 9/jessie
@@ -23,7 +23,7 @@
 GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
 Directory: 9/slim
 
-Tags: 9.11.1-stretch, 9.11-stretch, 9-stretch
+Tags: 9.11.1-stretch, 9.11-stretch, 9-stretch, 9.11.1, 9.11, 9
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
 Directory: 9/stretch
@@ -33,7 +33,7 @@
 GitCommit: 9023f588717d236a92d91a8483ff0582484c22d1
 Directory: 9/wheezy
 
-Tags: 8.11.1-jessie, 8.11-jessie, 8-jessie, carbon-jessie, 8.11.1, 8.11, 8, carbon
+Tags: 8.11.1-jessie, 8.11-jessie, 8-jessie, carbon-jessie
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
 Directory: 8/jessie
@@ -53,7 +53,7 @@
 GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
 Directory: 8/slim
 
-Tags: 8.11.1-stretch, 8.11-stretch, 8-stretch, carbon-stretch
+Tags: 8.11.1-stretch, 8.11-stretch, 8-stretch, carbon-stretch, 8.11.1, 8.11, 8, carbon
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
 Directory: 8/stretch
@@ -63,7 +63,7 @@
 GitCommit: b3ca6573b5c179148b446107386ae96ac6204ad3
 Directory: 8/wheezy
 
-Tags: 6.14.2-jessie, 6.14-jessie, 6-jessie, boron-jessie, 6.14.2, 6.14, 6, boron
+Tags: 6.14.2-jessie, 6.14-jessie, 6-jessie, boron-jessie
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
 Directory: 6/jessie
@@ -83,7 +83,7 @@
 GitCommit: bb49c321f761c333ba87b18770121651f0a3004c
 Directory: 6/slim
 
-Tags: 6.14.2-stretch, 6.14-stretch, 6-stretch, boron-stretch
+Tags: 6.14.2-stretch, 6.14-stretch, 6-stretch, boron-stretch, 6.14.2, 6.14, 6, boron
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: bb49c321f761c333ba87b18770121651f0a3004c
 Directory: 6/stretch
@@ -93,7 +93,7 @@
 GitCommit: bb49c321f761c333ba87b18770121651f0a3004c
 Directory: 6/wheezy
 
-Tags: 4.9.1-jessie, 4.9-jessie, 4-jessie, argon-jessie, 4.9.1, 4.9, 4, argon
+Tags: 4.9.1-jessie, 4.9-jessie, 4-jessie, argon-jessie
 Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
 GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
 Directory: 4/jessie
@@ -113,7 +113,7 @@
 GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
 Directory: 4/slim
 
-Tags: 4.9.1-stretch, 4.9-stretch, 4-stretch, argon-stretch
+Tags: 4.9.1-stretch, 4.9-stretch, 4-stretch, argon-stretch, 4.9.1, 4.9, 4, argon
 Architectures: amd64, ppc64le, arm64v8, arm32v7, i386
 GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
 Directory: 4/stretch
@@ -123,7 +123,7 @@
 GitCommit: f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7
 Directory: 4/wheezy
 
-Tags: 10.0.0-jessie, 10.0-jessie, 10-jessie, jessie, 10.0.0, 10.0, 10, latest
+Tags: 10.0.0-jessie, 10.0-jessie, 10-jessie, jessie
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: 64eed01a95c5672ee9426e5e6be19a39b178a103
 Directory: 10/jessie
@@ -138,7 +138,7 @@
 GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
 Directory: 10/slim
 
-Tags: 10.0.0-stretch, 10.0-stretch, 10-stretch, stretch
+Tags: 10.0.0-stretch, 10.0-stretch, 10-stretch, stretch, 10.0.0, 10.0, 10, latest
 Architectures: amd64, ppc64le, s390x, arm64v8, arm32v7, i386
 GitCommit: 80814e984e9faa5e9195f9a61632e1898f6633d9
 Directory: 10/stretch

chorrell

This comment was marked as off-topic.

chorrell

This comment was marked as off-topic.

chorrell

This comment was marked as off-topic.

chorrell

This comment was marked as off-topic.

@chorrell
Copy link
Contributor

chorrell commented May 1, 2018

What's the benefit of moving the default Dockerfile to a named subdirectory?

@LaurentGoderre
Copy link
Member Author

@chorrell first I think it's useful to have the -jessie tag so that we can change the default variant but alloow developers to pin to jessie of they need to. It also makes switching the default debian version trivial.

@LaurentGoderre LaurentGoderre force-pushed the no-default-variant branch 3 times, most recently from ff46be7 to 1c970ff Compare May 3, 2018 03:22
@LaurentGoderre
Copy link
Member Author

I think this is ready to go.

@chorrell what do you think?

@chorrell
Copy link
Contributor

chorrell commented May 3, 2018

Sure

@LaurentGoderre
Copy link
Member Author

@chorrell you don't sound convince. What makes you unsure about it?

@chorrell
Copy link
Contributor

chorrell commented May 3, 2018

It's a useful change, but I don't see it as being urgent. There's been a lot of recent changes, specifically with the update and PR process, and I'd prefer if we waited until after a few Node.js updates before landing anything new.

@LaurentGoderre
Copy link
Member Author

That's a valid point!

PeterDaveHello

This comment was marked as off-topic.

PeterDaveHello

This comment was marked as off-topic.

@LaurentGoderre LaurentGoderre force-pushed the no-default-variant branch 4 times, most recently from 6991fdb to 8acf726 Compare May 4, 2018 16:19
@LaurentGoderre
Copy link
Member Author

I didn't apply that logic to chakracore because it doesn't have variants yet.

@chorrell
Copy link
Contributor

No, that's not what I mean. That's all the output I get from generate-stackbrew-library.sh. I was expecting the full manifest output but it's only generating output for chakracore

@LaurentGoderre
Copy link
Member Author

Oh really....something might have got lost in all the rebasing

@LaurentGoderre
Copy link
Member Author

@chorrell fixed!

chorrell

This comment was marked as off-topic.

PeterDaveHello

This comment was marked as off-topic.

@LaurentGoderre LaurentGoderre force-pushed the no-default-variant branch 6 times, most recently from da05898 to db7f5bb Compare May 21, 2018 11:23
@LaurentGoderre
Copy link
Member Author

All done!

PeterDaveHello

This comment was marked as off-topic.

PeterDaveHello

This comment was marked as off-topic.

@LaurentGoderre LaurentGoderre force-pushed the no-default-variant branch 4 times, most recently from 7b02f20 to 730c97a Compare May 24, 2018 16:00
@LaurentGoderre
Copy link
Member Author

Ok, I rebased and cleaned up this PR

@LaurentGoderre
Copy link
Member Author

Ok, rebased

PeterDaveHello

This comment was marked as off-topic.

Explicitly define the debian version to use for onbuild
PeterDaveHello

This comment was marked as off-topic.

@PeterDaveHello PeterDaveHello merged commit 9e2b585 into nodejs:master May 28, 2018
@LaurentGoderre LaurentGoderre deleted the no-default-variant branch May 28, 2018 03:59
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