Skip to content

Commit 6164829

Browse files
author
Ian Campbell
committed
CI: Build a matrix of images
Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 786fbc7 commit 6164829

File tree

5 files changed

+285
-8
lines changed

5 files changed

+285
-8
lines changed

.circleci/config.yml

Lines changed: 194 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,18 @@ linuxkit_pkg_build: &linuxkit_pkg_build
2525
mkdir /workspace/packages
2626
linuxkit pkg build pkg/$PKG
2727
linuxkit pkg show-tag pkg/$PKG > /workspace/packages/$PKG.tag
28-
docker save -o /workspace/packages/$PKG.tar $(cat /workspace/packages/$PKG.tag)
28+
echo
29+
docker image ls --all
30+
# If image already existed on hub then it would be pulled
31+
# rather than built above and in that case we do not have
32+
# the -ARCH version locally.
33+
#if ! docker image inspect $(cat /workspace/packages/$PKG.tag)-amd64 2>/dev/null ; then
34+
# docker image save -o /workspace/packages/$PKG.tar $(cat /workspace/packages/$PKG.tag)
35+
#else
36+
# docker image save -o /workspace/packages/$PKG.tar $(cat /workspace/packages/$PKG.tag){,-amd64}
37+
#fi
38+
# Include all tags, e.g. hash and hash-ARCH if both are present
39+
docker image save -o /workspace/packages/$PKG.tar linuxkit/$PKG
2940
- persist_to_workspace:
3041
root: /workspace
3142
paths: packages
@@ -58,11 +69,72 @@ image_cache_build: &image_cache_build
5869
mkdir /workspace/packages
5970
make --no-print-directory -C pkg/image-cache build-$CACHE
6071
make --no-print-directory -C pkg/image-cache show-tag-$CACHE > /workspace/packages/$PKG.tag
61-
docker save -o /workspace/packages/$PKG.tar $(cat /workspace/packages/$PKG.tag)
72+
echo
73+
docker image ls --all
74+
#if ! docker image inspect $(cat /workspace/packages/$PKG.tag)-amd64 2>/dev/null ; then
75+
# docker image save -o /workspace/packages/$PKG.tar $(cat /workspace/packages/$PKG.tag)
76+
#else
77+
# docker image save -o /workspace/packages/$PKG.tar $(cat /workspace/packages/$PKG.tag){,-amd64}
78+
#fi
79+
# Include all tags, e.g. hash and hash-ARCH if both are present
80+
docker image save -o /workspace/packages/$PKG.tar linuxkit/$PKG
6281
- persist_to_workspace:
6382
root: /workspace
6483
paths: packages
6584

85+
image_build: &image_build
86+
docker:
87+
- image: debian:stretch
88+
steps:
89+
- run:
90+
name: Configure $PATH
91+
command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
92+
- run:
93+
name: Install packages
94+
# ca-certificates are needed for attach_workspace (and git over https)
95+
command: apt-get update && apt-get install -y ca-certificates curl git make openssh-client
96+
- attach_workspace:
97+
at: /workspace
98+
- checkout
99+
- setup_remote_docker:
100+
version: 17.06.1-ce
101+
- run:
102+
name: Importing packages from workspace
103+
command: |
104+
docker image load --input /workspace/packages/kubelet.tar
105+
case "$KUBE_RUNTIME" in
106+
docker)
107+
docker image load --input /workspace/packages/kubernetes-docker-image-cache-common.tar
108+
docker image load --input /workspace/packages/kubernetes-docker-image-cache-control-plane.tar
109+
;;
110+
cri-containerd)
111+
docker image load --input /workspace/packages/cri-containerd.tar
112+
;;
113+
*)
114+
echo "Unknown $KUBE_RUNTIME"
115+
exit 1
116+
;;
117+
esac
118+
echo
119+
docker image ls --all
120+
- run:
121+
name: Build images
122+
command: |
123+
mkdir -p /workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK
124+
df -h .
125+
# KUBE_FORMATS="iso-efi iso-bios" times out or fails for larger docker images.
126+
# Just do tar for now.
127+
make KUBE_FORMATS="tar" kube-master.iso kube-node.iso
128+
du -shc *.tar
129+
#du -shc *.iso
130+
#mv kube-master*.iso kube-node*.iso /workspace/images/kube-$KUBE_RUNTIME-$KUBE_NETWORK
131+
#- store_artifacts:
132+
# path: /workspace/images
133+
# destination: images
134+
#- persist_to_workspace:
135+
# root: /workspace
136+
# paths: images
137+
66138
version: 2
67139
jobs:
68140
dependencies:
@@ -80,7 +152,10 @@ jobs:
80152
command: |
81153
curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz
82154
tar xfO /tmp/docker.tgz docker/docker > /workspace/bin/docker
83-
curl -fsSL -o /workspace/bin/linuxkit https://188-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
155+
# TEMP: From https://github.com/linuxkit/linuxkit/pull/2772 for `linuxkit pkg push --nobuild` support
156+
curl -fsSL -o /workspace/bin/linuxkit https://203-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
157+
curl -fsSL -o /workspace/bin/notary https://github.com/theupdateframework/notary/releases/download/v0.4.3/notary-Linux-amd64
158+
curl -fsSL -o /workspace/bin/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
84159
85160
echo "Downloaded:"
86161
sha256sum /workspace/bin/*
@@ -89,13 +164,17 @@ jobs:
89164
echo "Checking checksums"
90165
sha256sum -c <<EOF
91166
6af40e74b2dbb2927882acab52d50bfc72551779d541957fc70b6adc325ee5ef /workspace/bin/docker
92-
841425e37f713fcb19cb84a60e42df8a6e09066616eee0f4a00ee87bab7cb6dc /workspace/bin/linuxkit
167+
23c7e2d909e0055df4b51fdda8fa63d72a1803347d08e8d3fe8dd37c13c0ba03 /workspace/bin/linuxkit
168+
e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d /workspace/bin/manifest-tool
169+
06cd02c4c2e7a3b1ad9899b03b3d4dde5392d964c675247d32f604a24661f839 /workspace/bin/notary
93170
EOF
94171
- run:
95172
name: Versions
96173
command: |
97174
chmod +x /workspace/bin/docker # docker version deferred until daemon configured in relevant jobs
98175
chmod +x /workspace/bin/linuxkit && /workspace/bin/linuxkit version
176+
chmod +x /workspace/bin/manifest-tool && /workspace/bin/manifest-tool --version
177+
chmod +x /workspace/bin/notary && /workspace/bin/notary version
99178
- persist_to_workspace:
100179
root: /workspace
101180
paths: bin
@@ -134,7 +213,46 @@ jobs:
134213
pkg-image-cache-control-plane:
135214
<<: *image_cache_build
136215

137-
pkgs:
216+
image-docker-weave:
217+
<<: *image_build
218+
environment:
219+
- KUBE_RUNTIME: docker
220+
- KUBE_NETWORK: weave
221+
image-docker-bridge:
222+
<<: *image_build
223+
environment:
224+
- KUBE_RUNTIME: docker
225+
- KUBE_NETWORK: bridge
226+
227+
image-cri-containerd-weave:
228+
<<: *image_build
229+
environment:
230+
- KUBE_RUNTIME: cri-containerd
231+
- KUBE_NETWORK: weave
232+
image-cri-containerd-bridge:
233+
<<: *image_build
234+
environment:
235+
- KUBE_RUNTIME: cri-containerd
236+
- KUBE_NETWORK: bridge
237+
238+
#images:
239+
# docker:
240+
# - image: debian:stretch
241+
# steps:
242+
# - run:
243+
# name: Configure $PATH
244+
# command: echo 'export PATH=/workspace/bin:$PATH' >> $BASH_ENV
245+
# - run:
246+
# name: Install packages
247+
# # ca-certificates are needed for attach_workspace (and git over https)
248+
# command: apt-get update && apt-get install -y ca-certificates git make openssh-client
249+
# - attach_workspace:
250+
# at: /workspace
251+
# - store_artifacts:
252+
# path: /workspace/images
253+
# destination: .
254+
255+
push-pkgs-to-hub:
138256
docker:
139257
- image: debian:stretch
140258
steps:
@@ -144,7 +262,7 @@ jobs:
144262
- run:
145263
name: Install packages
146264
# ca-certificates are needed for attach_workspace (and git over https)
147-
command: apt-get update && apt-get install -y ca-certificates
265+
command: apt-get update && apt-get install -y ca-certificates expect git jq openssh-client
148266
- attach_workspace:
149267
at: /workspace
150268
- checkout
@@ -157,10 +275,33 @@ jobs:
157275
- run:
158276
name: Import packages
159277
command: |
278+
ls -lhRt /workspace/
279+
cat /workspace/packages/*.tag
280+
echo
160281
for pkg in /workspace/packages/*.tar ; do
161282
docker image load --input $pkg
162283
done
284+
echo
163285
docker image ls --all
286+
- run:
287+
name: Login & setup content trust
288+
command: |
289+
docker login -u $DOCKER_USER -p $DOCKER_PASS
290+
mkdir -p ~/.docker/trust/private
291+
cp .circleci/content-trust.key ~/.docker/trust/private/b056f84873aa0be205dfe826afa6e7458120c9569dd19a2a84154498fb1165d5.key
292+
- run:
293+
name: Push packages
294+
command: |
295+
# PRs from forks do not have access to the necessary secrets to do the push.
296+
if [ -z "$DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE" ] ; then
297+
echo "DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE not set (likely this is a PR from a fork)."
298+
echo "No credentials available, not pushing to hub."
299+
exit 0
300+
fi
301+
302+
# Just one for testing now
303+
linuxkit pkg push --nobuild pkg/cri-containerd
304+
164305
workflows:
165306
version: 2
166307
build:
@@ -182,9 +323,55 @@ workflows:
182323
- pkg-image-cache-control-plane:
183324
requires:
184325
- dependencies
185-
- pkgs:
326+
#- pkgs:
327+
# requires:
328+
# - pkg-kubelet
329+
# - pkg-cri-containerd
330+
# - pkg-image-cache-common
331+
# - pkg-image-cache-control-plane
332+
333+
- image-docker-weave:
334+
requires:
335+
- dependencies
336+
- pkg-kubelet
337+
- pkg-image-cache-common
338+
- pkg-image-cache-control-plane
339+
- image-docker-bridge:
340+
requires:
341+
- dependencies
342+
- pkg-kubelet
343+
- pkg-image-cache-common
344+
- pkg-image-cache-control-plane
345+
- image-cri-containerd-weave:
346+
requires:
347+
- dependencies
348+
- pkg-kubelet
349+
- pkg-cri-containerd
350+
- image-cri-containerd-bridge:
351+
requires:
352+
- dependencies
353+
- pkg-kubelet
354+
- pkg-cri-containerd
355+
356+
#- images:
357+
# requires:
358+
# - check-hashes
359+
# - image-docker-weave
360+
# - image-docker-bridge
361+
# - image-cri-containerd-weave
362+
# - image-cri-containerd-bridge
363+
364+
- push-pkgs-to-hub:
365+
# We want everything to have passed, which is a bit
366+
# tedious. Some of these are already covered transitively,
367+
# but be more explicit.
186368
requires:
369+
- check-hashes
187370
- pkg-kubelet
188371
- pkg-cri-containerd
189372
- pkg-image-cache-common
190373
- pkg-image-cache-control-plane
374+
- image-docker-weave
375+
- image-docker-bridge
376+
- image-cri-containerd-weave
377+
- image-cri-containerd-bridge

.circleci/content-trust.crt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIFxDCCA6wCCQDB3AGNjPBlEjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UEBhMC
3+
VUsxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
4+
ETAPBgNVBAoMCExpbnV4S2l0MSswKQYDVQQLDCJMaW51eEtpdC9LdWJlcm5ldGVz
5+
IENJIHNpZ25pbmcga2V5MScwJQYDVQQDDB5naXRodWIuY29tL2xpbnV4a2l0L2t1
6+
YmVybmV0ZXMwHhcNMTcxMTIxMTY1ODQ0WhcNMTgxMTIxMTY1ODQ0WjCBozELMAkG
7+
A1UEBhMCVUsxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1i
8+
cmlkZ2UxETAPBgNVBAoMCExpbnV4S2l0MSswKQYDVQQLDCJMaW51eEtpdC9LdWJl
9+
cm5ldGVzIENJIHNpZ25pbmcga2V5MScwJQYDVQQDDB5naXRodWIuY29tL2xpbnV4
10+
a2l0L2t1YmVybmV0ZXMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF
11+
lc4gUNtWX8OUxCOD65NHnnIQNjbfF28IA4L20lfhfrnzhGY4a6eCN2IwTDtD1huJ
12+
6/2fg4QcUHiZdWj9PmnsGsblNrxUAjuJNSypyBhV24C9kk7se8pSt0N7/HlHAiIV
13+
whaRMqiiR5+SZKI5IMZFltcu3YuPzGWy+RbS/3o4f4WArfQVGXUPAxovfxqxOFhp
14+
onGi2zTm8bg307i3zzQ+3YkVeEoG7MyVrGHLSAmoCMnTP8NU5WFVJrlPe/Hea3+0
15+
3IdNp/+V4SVdM+ET/+mqf5fuRdJibT2R64u69t8rAOh5iaUGzPORoJmcXbG3fBQW
16+
uYe1MEezj953Xny85AGhRinAsJok6VHA/nYkTBpZQtRv82CVSj+rg7oyfvy9f3SG
17+
mLYw4JpMOMAGq0ywLvt4p/DNIey7RFurLhp5bnNh1Dprbc3I2dgb3TlPRZZ32OV8
18+
66JKxQg5aweS8efech7PqbBpuf4OHrprjhXZWgH9hHgfONNT3qnlqgigd5SI2S23
19+
1tIXdzcM4kjMQ+18KBvYOVwhmjJV5LQUfbE/+R+NN47gVIKm/NwPW891UXRxczKW
20+
uMHccyox5Xqhf/nW9wEEKQvq+JSlgtXczLFgMFCYrNUwALP6BX2Y/7Kfd5VrnTrD
21+
GPASh/AWn/RK/nxCbNcdWgIYU2ABoPs4MTCsO5GapQIDAQABMA0GCSqGSIb3DQEB
22+
CwUAA4ICAQBk+UAEtgFMnbTobO0zH3pxUrAAsqRT2GWeWNdVc8NOjj7zzkJyl6G1
23+
epUT1KyjyrfSNWF0l/cMgosTIJKQA7+gQDRivS/pp+4vWLq0/pjkCtGlJO9batuf
24+
ELALlWHeXKj4C7Adx5QAyDuvGqnH2JrCLX++GyZvcU76gv0Y/KRr+Ttj057ILenL
25+
/2xNyFuwXgb1/243m2DRWs8mILI0a731X+l2W/sp8LLnArKhiCcSZXaJNVHTrDqg
26+
a2YKR/edjRDG/GL2F/5F/8s27EgKhZfiEKtuCQz+Cl3yIMuE+lM/ObTHvYpU+qhO
27+
ypwka6Yfri2fwYIaPAHUHBGiyeVzJMANluifZd6mMzd8o8FWhFhKrUUOrhhuEAh6
28+
3fagymS2vqf4LvUqtvIp0BPwQ4L+RmiucHXSTprDIbTOHHidHJ2DeHGDM5XTfE/J
29+
U72Btj9a+VX3M1XY3IhOCUVUOTET92Ey4n1GJ497f4vOKZ34d3A79fDhXGr2cSAK
30+
1CW0M0v8obFrpMu6vd6NqeSazz5vthYMqJOTKhtpAFvt8lROqQLYNwZ5uBzEDphz
31+
Dv8kLuTHHjspl5Q2wQRt7iqB+cn+cH1BU/pOkNVa+MCZiwB9HnB/YyMspKf0S1QS
32+
wFMq67DIzyxhSEo9IorVGsg0LRByVjEY6uK8aBERFARLELug8k+xVg==
33+
-----END CERTIFICATE-----

.circleci/content-trust.key

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
Proc-Type: 4,ENCRYPTED
3+
DEK-Info: AES-256-CBC,054D79A3BFFB818D6EA3FF54A0457C31
4+
5+
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
54+
-----END RSA PRIVATE KEY-----

pkg/cri-containerd/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ image: cri-containerd
33
network: true
44
arches:
55
- amd64
6+
# to bump the following try:
7+
# sed -i -e "s,^\(# force a rebuild: \).*,\1$(date),g" pkg/cri-containerd/build.yml
8+
# force a rebuild: Fri 24 Nov 13:35:30 GMT 2017

yml/cri-containerd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
- name: cri-containerd
3-
image: linuxkit/cri-containerd:c206b83f7157da2b632565bd3c9deeece468d6d6
3+
image: linuxkit/cri-containerd:6d4f142e964f767fb209519bea4ce8d216f15a89
44
files:
55
- path: /etc/kubelet.sh.conf
66
contents: |

0 commit comments

Comments
 (0)