Skip to content

Commit

Permalink
Bug 1901033 - image_builder: update kaniko and skopeo. r=glandium
Browse files Browse the repository at this point in the history
Adjust kaniko arguments passed in by build-image:
- pass --cache=true to kaniko, otherwise it seems to look for an image named
  "parent" on docker hub instead of looking at the tar we put in the cache dir
- pass a cache-repo to kaniko, otherwise it refuses to enable caching
  (GoogleContainerTools/kaniko#374)

Differential Revision: https://phabricator.services.mozilla.com/D213062

UltraBlame original commit: 55df8fca8ebb22f4cda5fa8a8393c0f88626f65f
  • Loading branch information
marco-c committed Jun 16, 2024
1 parent 381c8b5 commit 278bb6c
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 7 deletions.
4 changes: 2 additions & 2 deletions taskcluster/docker/image_builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ golang
:
1
.
14
22
as
skopeo
WORKDIR
Expand Down Expand Up @@ -91,7 +91,7 @@ golang
:
1
.
14
22
as
kaniko
WORKDIR
Expand Down
24 changes: 23 additions & 1 deletion taskcluster/docker/image_builder/build-image/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,13 @@ args
-
-
cache
=
true
"
"
-
-
cache
-
dir
"
Expand All @@ -554,6 +561,21 @@ workspace
/
cache
"
"
-
-
cache
-
repo
"
"
oci
:
/
workspace
/
repo
"
]
)
.
Expand All @@ -573,7 +595,7 @@ arg
"
-
-
whitelist
ignore
-
var
-
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/docker/image_builder/build-kaniko.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ branch
=
v1
.
0
23
.
0
https
Expand All @@ -42,5 +42,5 @@ kaniko
.
git
checkout
146ec6a9cd6f87b4a12e8119ded575d5edca35ac
98df8ebfc7834a720c83b81bd0b1d54f4f480477
make
4 changes: 2 additions & 2 deletions taskcluster/docker/image_builder/build-skopeo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ branch
=
v1
.
1
15
.
1
https
Expand All @@ -42,7 +42,7 @@ skopeo
.
git
checkout
67abbb3cefbdc876447583d5ea45e76bf441eba7
e2ea426918973e5e007a5e1e2457a41ab336fc41
export
GO111MODULE
=
Expand Down

0 comments on commit 278bb6c

Please sign in to comment.