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

make Fedora 26 multi-arch #3176

Merged
merged 2 commits into from
Jul 11, 2017
Merged

make Fedora 26 multi-arch #3176

merged 2 commits into from
Jul 11, 2017

Conversation

maxamillion
Copy link
Contributor

Signed-off-by: Adam Miller [email protected]

Signed-off-by: Adam Miller <[email protected]>
library/fedora Outdated
GitCommit: 69595d6a555ba347423caa5ed1f1b687367ff29c
Architectures: amd64, arm32v7, arm64v8, ppc64le
amd64-GitFetch: refs/heads/26
amd64-GitCommit: c726745cc3626a741f3e28551118bcf7193a37b7
Copy link
Member

Choose a reason for hiding this comment

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

Since these all share the same branch/commit, I'd recommend doing this instead (which will also quiet Travis):

Tags: 26, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le
GitFetch: refs/heads/26
GitCommit: c726745cc3626a741f3e28551118bcf7193a37b7
amd64-Directory: x86_64
arm32v7-Directory: armhfp
arm64v8-Directory: aarch64
ppc64le-Directory: ppc64le

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh that's so much easier! Thanks, will update.

@tianon
Copy link
Member

tianon commented Jul 11, 2017

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 81f1d2f..5ccf30e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,7 @@
 fedora:24 @ amd64
 fedora:25 @ amd64
 fedora:26 @ amd64
+fedora:26 @ arm32v7
+fedora:26 @ arm64v8
+fedora:26 @ ppc64le
 fedora:rawhide @ amd64
diff --git a/fedora_26/Dockerfile b/fedora_26/Dockerfile
index bc21d9c..572ee03 100644
--- a/fedora_26/Dockerfile
+++ b/fedora_26/Dockerfile
@@ -3,4 +3,4 @@ MAINTAINER \
 [Adam Miller <[email protected]>] \
 [Patrick Uiterwijk <[email protected]>]
 ENV DISTTAG=f26docker FGC=f26 FBR=f26
-ADD fedora-26-20170705.tar.xz /
+ADD fedora-26-x86_64-20170705.tar.xz /
diff --git a/fedora_26/fedora-26-20170705.tar.xz b/fedora_26/fedora-26-x86_64-20170705.tar.xz
similarity index 100%
rename from fedora_26/fedora-26-20170705.tar.xz
rename to fedora_26/fedora-26-x86_64-20170705.tar.xz
diff --git a/fedora_26/fedora-26-20170705.tar.xz  'tar -t' b/fedora_26/fedora-26-x86_64-20170705.tar.xz  'tar -t'
similarity index 100%
rename from fedora_26/fedora-26-20170705.tar.xz  'tar -t'
rename to fedora_26/fedora-26-x86_64-20170705.tar.xz  'tar -t'

@tianon
Copy link
Member

tianon commented Jul 11, 2017

LGTM!!! 🎉

Build test of #3176; fdcd540 (fedora):

$ bashbrew build fedora:latest
Building bashbrew/cache:e70f65b74a44e7d0a437ee71db07bccff1a49862a6fc8a87ab8e7b4057191b04 (fedora:latest)
Tagging fedora:latest
Tagging fedora:26

$ test/run.sh fedora:latest
testing fedora:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:25
Using bashbrew/cache:422b1eb2192286a63d0c72568c8c7ae92940ea289c0834fd36251a5811682a13 (fedora:25)
Tagging fedora:25

$ test/run.sh fedora:25
testing fedora:25
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:24
Using bashbrew/cache:822cacba5486d0e6269c396be60d614bb4b6496d0c4a1f893d33ee0f328c2c94 (fedora:24)
Tagging fedora:24

$ test/run.sh fedora:24
testing fedora:24
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:rawhide
Using bashbrew/cache:4bb1e34ed2498d46d72445fe5751f1d8da81d234ff48edd507d4c40a2b49ef3d (fedora:rawhide)
Tagging fedora:rawhide

$ test/run.sh fedora:rawhide
testing fedora:rawhide
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 0aa1a30 into docker-library:master Jul 11, 2017
tianon added a commit to docker-library/oi-janky-groovy that referenced this pull request Jul 11, 2017
@tianon tianon mentioned this pull request Aug 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants