Skip to content

Fix architectures lists for consistency and correctness #1153

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.

Sign up for GitHub

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
LaurentGoderre merged 1 commit into from
Nov 18, 2019
Merged

Fix architectures lists for consistency and correctness #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,13 @@ jobs:
- NODE_VERSION="8"
- VARIANT="alpine3.10"

- stage: Build
before_script: *auto_skip
name: 8 on onbuild
env:
- NODE_VERSION="8"
- VARIANT="onbuild"

- stage: Build
before_script: *auto_skip
name: chakracore/10 on default
Expand Down
14 changes: 7 additions & 7 deletions 13/architectures
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bashbrew-arch variants
amd64 alpine,stretch,stretch-slim,buster,buster-slim
arm32v6 alpine
arm32v7 alpine,stretch,stretch-slim,buster,buster-slim
arm64v8 alpine,stretch,stretch-slim,buster,buster-slim
i386 alpine
ppc64le alpine,stretch,stretch-slim,buster,buster-slim
s390x alpine,stretch,stretch-slim,buster,buster-slim
amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10
arm32v6 alpine3.10
Copy link
Member

@LaurentGoderre LaurentGoderre Nov 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching that @tianon! I missed it in the rebase!

arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10
arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10
i386 alpine3.10
ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10
s390x stretch,stretch-slim,buster,buster-slim,alpine3.10
2 changes: 1 addition & 1 deletion 8/architectures
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,al
arm32v6 alpine3.9,alpine3.10
arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
i386 jessie,jessie-slim,alpine,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
14 changes: 7 additions & 7 deletions architectures
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bashbrew-arch variants
amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
Copy link
Member

@nschonni nschonni Nov 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't think "onbuild" should be added here since it's no longer supported

Copy link
Contributor Author

@tianon tianon Nov 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is that node:8-onbuild still exists (and the directory still exists), so for that to continue to exist, it has to be listed here too:

$ bashbrew list node | grep onbuild
node:8.16.2-onbuild
node:8.16-onbuild
node:8-onbuild
node:carbon-onbuild

https://github.com/docker-library/official-images/blob/f396b68d8be74ecd83dac3d6aa6f18bdb7e575d8/library/node#L21-L24

Copy link
Contributor Author

@tianon tianon Nov 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, I'm happy to remove onbuild, but that does mean this final onbuild image goes away too, and I'm guessing it was left in on purpose?

Copy link
Member

@nschonni nschonni Nov 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I'm missing where it is being used, since "onbuild" is still in the 8/architectures, but maybe this is something that the stackbrew generation needs in both places

Copy link
Contributor Author

@tianon tianon Nov 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#994 (comment)

So, this is where things got weird. What I found in testing was that the root file was somehow being used to determine the list of architecture+variant combinations that it was willing to try, so when I copied this file as-is to the root, all the jessie variants went away completely, which is why I've updated the root file here to simply list every possible variant for every supported architecture and opted instead to be explicit per-version which arch+variant combinations are supported.

Copy link
Member

@nschonni nschonni Nov 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! i'll see if I can figure out if that file is removable separately

arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild