Multi-arch support

[davidcurrie]

This should look familiar!

[yosifkit]

Diff:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index 50aa88e..15570cd 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,24 @@
 websphere-liberty:beta @ amd64
+websphere-liberty:beta @ i386
+websphere-liberty:beta @ ppc64le
+websphere-liberty:beta @ s390x
 websphere-liberty:kernel @ amd64
+websphere-liberty:kernel @ i386
+websphere-liberty:kernel @ ppc64le
+websphere-liberty:kernel @ s390x
 websphere-liberty:latest @ amd64
+websphere-liberty:latest @ i386
+websphere-liberty:latest @ ppc64le
+websphere-liberty:latest @ s390x
 websphere-liberty:microProfile @ amd64
+websphere-liberty:microProfile @ i386
+websphere-liberty:microProfile @ ppc64le
+websphere-liberty:microProfile @ s390x
 websphere-liberty:webProfile6 @ amd64
+websphere-liberty:webProfile6 @ i386
+websphere-liberty:webProfile6 @ ppc64le
+websphere-liberty:webProfile6 @ s390x
 websphere-liberty:webProfile7 @ amd64
+websphere-liberty:webProfile7 @ i386
+websphere-liberty:webProfile7 @ ppc64le
+websphere-liberty:webProfile7 @ s390x
diff --git a/websphere-liberty_webProfile7/Dockerfile b/websphere-liberty_webProfile7/Dockerfile
index 997a817..1b25b78 100644
--- a/websphere-liberty_webProfile7/Dockerfile
+++ b/websphere-liberty_webProfile7/Dockerfile
@@ -18,10 +18,8 @@ ARG REPOSITORIES_PROPERTIES=""
 
 COPY server.xml /config/
 
-RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then \
-    mkdir /opt/ibm/wlp/etc/ \
-    echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; \
-  fi \
+RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \
+  && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \
   && installUtility install --acceptLicense \
     appSecurity-2.0 bluemixUtility-1.0 collectiveMember-1.0 ldapRegistry-3.0 \
     localConnector-1.0 microProfile-1.0 monitor-1.0 restConnector-1.0 \

[yosifkit]

Build test of #3436; 0155f80 (websphere-liberty):

$ bashbrew build websphere-liberty:kernel
Building bashbrew/cache:78030755f9d7a9163c8a22e7e5766afd29733832d85c9e3e95f84726972f8b12 (websphere-liberty:kernel)
Tagging websphere-liberty:kernel

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


$ bashbrew build websphere-liberty:microProfile
Building bashbrew/cache:3776ffd79538c226100ca40b89b0958810a649e84c459376d5fc45ce3ff10b59 (websphere-liberty:microProfile)
Tagging websphere-liberty:microProfile

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


$ bashbrew build websphere-liberty:webProfile6
Building bashbrew/cache:42d0344049446f815c36715545c5d22b63362dda42a5d2f486ba1753643518b9 (websphere-liberty:webProfile6)
Tagging websphere-liberty:webProfile6

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


$ bashbrew build websphere-liberty:webProfile7
Building bashbrew/cache:138b568384baf3762496949d0fcd7b65cf55e55f269b4e663879575a76fd644d (websphere-liberty:webProfile7)
Tagging websphere-liberty:webProfile7

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


$ bashbrew build websphere-liberty:javaee7
Building bashbrew/cache:b3831709895657d9126c00b3d89b204848acb180861b87ef5aeed9bca66847be (websphere-liberty:javaee7)
Tagging websphere-liberty:javaee7
Tagging websphere-liberty:latest

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


$ bashbrew build websphere-liberty:beta
Building bashbrew/cache:0d75825cdcf8aac8e7497aa4892e9933bd058001fee1182ecedb08ec4d7e4e11 (websphere-liberty:beta)
Tagging websphere-liberty:beta

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

[tianon]

🎂!!!

I'll mirror what I mentioned over in #3418 (comment):

You're going to want to make sure to disable whatever's currently pushing to https://hub.docker.com/r/s390x/websphere-liberty/ and https://hub.docker.com/r/ppc64le/websphere-liberty/, since our process has already taken those over (and replaced their descriptions). 👍

[davidcurrie]

Cool. Am I right in thinking that websphere-liberty is still just the amd64 version and not a manifest?

[tianon]

Correct, but not for long! See #2289 for updates on that. 👍

[davidcurrie]

Excellent - looking forward to it!

[tianon]

🤘

$ manifest-tool inspect websphere-liberty
Name:   websphere-liberty (Type: application/vnd.docker.distribution.manifest.list.v2+json)
Digest: sha256:430bd7c71facf1b78f9d6eb7c500d2510ed68e8f90f145a8875c3139281ecd97
 * Contains 4 manifest references:
1    Mfst Type: application/vnd.docker.distribution.manifest.v2+json
1       Digest: sha256:4500fad81a5ed35d9eb6b1310f5258f0b0599624920d5a0ac8b1cc3abc322f20
1  Mfst Length: 3663
1     Platform:
1           -      OS: linux
1           - OS Vers: 
1           - OS Feat: []
1           -    Arch: amd64
1           - Variant: 
1           - Feature: 
1     # Layers: 16
         layer 1: digest = sha256:d5c6f90da05dc7e77d2e5fef63c341ab05ba2a03396ab5ae8f18814a7bbf5265
         layer 2: digest = sha256:1300883d87d5ae0582a4e0f3f86ad93985b18676e8d829f6f3b4990403fdf145
         layer 3: digest = sha256:c220aa3cfc1bff0c1df733eac869a66476ea35136c69d881da1e297ed8d0af2f
         layer 4: digest = sha256:2e9398f099dcc5a3e5521205e1f55ee5d7665e203193cf48b32553eabcca323c
         layer 5: digest = sha256:dc27a084064fee108f4d486469939bbfa6a5b16f6d6d3c6b5b2475e938f4c71e
         layer 6: digest = sha256:155fe9cd61245b4429c43c2e43f3997b94db345c9ca41bb54f6c34a4939a77ee
         layer 7: digest = sha256:fbf6b7dab19c35bcc21ad5816124aa13bc6eaf372035b5c189a9e85ba14b9ae9
         layer 8: digest = sha256:7450573d85475542472816186f3292445ab0f305cb769037e17590944159688b
         layer 9: digest = sha256:b110cdcc6b96e6fe1be97edad43e9b9660032d4f72d6b1e753ff52beefb5a433
         layer 10: digest = sha256:86dd7336dd6af5af87a53d5d1e6328a6b386cb91de2ceffe1e05e2d6a24b6997
         layer 11: digest = sha256:41f2cb12a6572b72b007313e93874c10552e297d54a86e875f22fbd6d6ec7245
         layer 12: digest = sha256:388270a7ef33af7980b2e79d2347992a24778079928d9c3b24554735a86f3675
         layer 13: digest = sha256:80175ab8181c47fab2a84f913c82dab17c42351d12337b1c23930c8c948f7c09
         layer 14: digest = sha256:90ed5a80832254879713e5251c8696870a5d5ccef555f27e987f685b602d08ee
         layer 15: digest = sha256:1b09eaab163ba264f12d396b1c4b4a4b44c5e86a9c8af01c263e4607147ec53b
         layer 16: digest = sha256:e1b1074d609acacce3272d4135abf1f04a16be7c1422fa0752a8f41cb93ad51b

2    Mfst Type: application/vnd.docker.distribution.manifest.v2+json
2       Digest: sha256:7f7b6179f1eae127b22fb4235f294ecd8b3959175318611eb850e526df32de34
2  Mfst Length: 3662
2     Platform:
2           -      OS: linux
2           - OS Vers: 
2           - OS Feat: []
2           -    Arch: 386
2           - Variant: 
2           - Feature: 
2     # Layers: 16
         layer 1: digest = sha256:386cf91244766a15867d7c4d5145a74812938e2870ec5cf26f0adaea9965b921
         layer 2: digest = sha256:fd05fe57b1dd5621709bbd7242f7d2fb06be680434764e95aa414393d8d70bd5
         layer 3: digest = sha256:7d9c27aeef149b035f5b7c003a8c67826570b1399fb46a802d9550613b075b17
         layer 4: digest = sha256:900fca59e30903ebb5b4071fbc78182b6684957890eb1d5d38404d4188175ac8
         layer 5: digest = sha256:36c0ed06b6c5db10ec1ae1fe56ac96358b863c5556df005d6d684b3d60e8b497
         layer 6: digest = sha256:efda194262de197fd778e7b01b166154146f97fb216b66e2393f79dade93d663
         layer 7: digest = sha256:e2f636b67f4c83e939075ba489cd823d330091701464bf50fd1a35ac87641901
         layer 8: digest = sha256:492802c1da71a7cb3b0c156e917aeb66e82e51608d1ee9f24bac0feb1ed3d741
         layer 9: digest = sha256:f0770f038dd2d174e4dc03b2edb7d8ac92724bc49431350c359d0e6be3298d1f
         layer 10: digest = sha256:374b0f6d7d402f9815175d52c645ab0f05a188a22869eac0cb9197949e6ffbb1
         layer 11: digest = sha256:102e35ad7b58a5efcea2445081b53687aa1f0147b40dc460485615d2a616ade4
         layer 12: digest = sha256:0aa8e09a9f496fb4a9138b02583bad3ecd591eef3aa49d731a6acb15803e6a14
         layer 13: digest = sha256:73e1b24fe53daf154518b6eae56b8adf1f83c9cdba3bf45a66ff335e68772fb8
         layer 14: digest = sha256:35700bda489febe16ec32c84175cb725059909d06c04bda231c2e8fcccb5fdd0
         layer 15: digest = sha256:89c81a5d4f66fe5c492584872879af6cef865a3a41a4a94e7cbff9b89ccf019b
         layer 16: digest = sha256:7e1bc1490e0846eaaaad2f837a0b72b2715a54b5e65010f0ea0bdc3fab0a9a60

3    Mfst Type: application/vnd.docker.distribution.manifest.v2+json
3       Digest: sha256:fa65ab278d5308be0fb492ac91e0919f29876c8066d44fb00262899a15110a4b
3  Mfst Length: 3663
3     Platform:
3           -      OS: linux
3           - OS Vers: 
3           - OS Feat: []
3           -    Arch: ppc64le
3           - Variant: 
3           - Feature: 
3     # Layers: 16
         layer 1: digest = sha256:0ad9ca03f1b2a7f12f5daadfdacaf6d12378930b9f2bc604e5ffc52f73b3a763
         layer 2: digest = sha256:7d2491df949431479c35e36dc67ee18250a9e033cb90681c34a86b498cb8dca6
         layer 3: digest = sha256:9a961cbb08c01b1964d6458776e7c7a232a14358cb316c0de0fa0cd8411aec7b
         layer 4: digest = sha256:9f38c9e24bdd039bd98512bebc0aac6efb2cbdf0d0ef5a1733b483ced8fa32a9
         layer 5: digest = sha256:36070ab6f935db2945692670fe2cbb715c92831b753dffdb47c203af50180ba3
         layer 6: digest = sha256:e44e9115c67572105f67c3828adf511a745acd128f4293dc1a25fb42d907204d
         layer 7: digest = sha256:a19364f87895fa38cfc0efdc614b1b6ec2cfdbcf00facd7a9fd90ed0dc90c601
         layer 8: digest = sha256:a77ae6898e7a27c9af709c2ae31754337eb1963262ec92944583172c95618c1c
         layer 9: digest = sha256:d90c5616192dbb8c6f1468a51e4394c7dbcb61a83d407baac2828b6a21da7bd9
         layer 10: digest = sha256:d9973637ca07f4636552c92d14bf3fecbf9cad8c8cee1bf0315a96bc2f8a7310
         layer 11: digest = sha256:aad857b7605519b9b00e122e568faa9907931199bd7674b866f09854ee0a305b
         layer 12: digest = sha256:10270a43a373a0f4c19e122a1da6777ca648b9ef4e00ef1cb879d57e59271647
         layer 13: digest = sha256:1564357b059a24e4672fb85a37199e07a80cbe7ff88e1ee0472e3917921f01fb
         layer 14: digest = sha256:67a718e7b6a4a767ecb715cf7313e3a50ccc2c732291e450cfa7ce8b7437393f
         layer 15: digest = sha256:96857a9a913fca70b98bd8a76a99dbf28cb5e5e81a51ae1b96de3ff5b77df76b
         layer 16: digest = sha256:30cb6e8c0986b18d14b85f549c77585e1e9f4042119f45db1f993191e1533a6a

4    Mfst Type: application/vnd.docker.distribution.manifest.v2+json
4       Digest: sha256:5ad7915d7ed82cc3c2e06e8f553b3dd9cb3a050f3868f5011546c5632e593cc4
4  Mfst Length: 3663
4     Platform:
4           -      OS: linux
4           - OS Vers: 
4           - OS Feat: []
4           -    Arch: s390x
4           - Variant: 
4           - Feature: 
4     # Layers: 16
         layer 1: digest = sha256:c58ca33e0c246871d07f22fecd3fe2b3fccd6176c69d03dc3e7ccfeb4ad51173
         layer 2: digest = sha256:fc3fd4e627556d1102bbe48fd34cbbb4aaee8fe726133cc81e0045cfb7a9b722
         layer 3: digest = sha256:0c7fa8f00fe2e7e69d9f4182cb28fdc934581a9d653d7f3bd9b8e9ec3548474a
         layer 4: digest = sha256:1618266695ce48a7ff8ae992c8bc490e2b327d2475417bba860461d52961d810
         layer 5: digest = sha256:7c037ccce0cbbbb5a51347a125b519fb0dd842d976543be03c1edef564f9a3a9
         layer 6: digest = sha256:2c3f4a21f2a7a44e4c9655e5b31ddb3eb79305eec38fba001102a56239334f6a
         layer 7: digest = sha256:47b1799dd456fa5925ea57b3edd686e2e21b4d79aa05f909079f4076f94ac054
         layer 8: digest = sha256:1d9ba5736f86ecda686367a680e8edbb93eaada7bd737e3a77e4a4063b225950
         layer 9: digest = sha256:af309917286f109b8304bf1f46555b74094aed7497cb28a402de7c0952603a68
         layer 10: digest = sha256:ff84ee2631f76fbb4fed80c9172d5683f019407afcc8965d47b26a1db6409c34
         layer 11: digest = sha256:db35164e51c87122d63fc728bcb7184521d03dd045acfda19c71bbbb09c65156
         layer 12: digest = sha256:4bef0a03e230d06b45157b850482f72e6b165af47a4e8259f7a6310c2b5230ce
         layer 13: digest = sha256:f862770423838e59c476bfb22c1f7dde88fa127d330921dc45b9269f0c1e2ced
         layer 14: digest = sha256:40e822934b4c64cc81d15d5a514258d7622a86f6255ad98c9d73cd3de46fb604
         layer 15: digest = sha256:3e1a2888e9f59d93e61a0a625b5a9b394fe327e5f19dd23e238092ac1a40af62
         layer 16: digest = sha256:ab556df9b43b088813404b95755382be13139f936e1989d8bdcc5ce8c83abf32