Skip to content

Commit b814276

Browse files
committed
Bumped version of linuxkit
* removed deprecated linuxkit flag from Makefile * Added clean Make target * Added build dirs to gitignore Signed-off-by: Micah Hausler <mhausler@amazon.com>
1 parent 6f97067 commit b814276

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
11
.env
2+
hook-*.tar.gz
3+
dist/
4+
out/
5+
tink-docker/local/
6+
bootkit/local/
7+
8+
*.swp

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ export DOCKER_CLI_EXPERIMENTAL := enabled
2222

2323
image-amd64:
2424
mkdir -p out
25-
linuxkit build -docker -disable-content-trust -pull -format kernel+initrd -name hook-x86_64 -dir out $(LINUXKIT_CONFIG)
25+
linuxkit build -docker -pull -format kernel+initrd -name hook-x86_64 -dir out $(LINUXKIT_CONFIG)
2626

2727
image-arm64:
2828
mkdir -p out
29-
linuxkit build -docker -disable-content-trust -pull -arch arm64 -format kernel+initrd -name hook-aarch64 -dir out $(LINUXKIT_CONFIG)
29+
linuxkit build -docker -pull -arch arm64 -format kernel+initrd -name hook-aarch64 -dir out $(LINUXKIT_CONFIG)
3030

3131
image: image-amd64 image-arm64
3232

@@ -110,3 +110,8 @@ ifeq ($(shell git rev-parse --abbrev-ref HEAD),master)
110110
s3cmd sync ./hook-${GIT_VERSION}.tar.gz s3://s.gianarb.it/hook/${GIT_VERSION}.tar.gz
111111
s3cmd cp s3://s.gianarb.it/hook/hook-${GIT_VERSION}.tar.gz s3://s.gianarb.it/hook/hook-master.tar.gz
112112
endif
113+
114+
.PHONY: clean
115+
clean:
116+
rm ./hook-${GIT_VERSION}.tar.gz
117+
rm -rf dist/ out/ tink-docker/local/ bootkit/local/

shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ let
2222
src = fetchFromGitHub {
2323
owner = "linuxkit";
2424
repo = "linuxkit";
25-
rev = "4cdf6bc56dd43227d5601218eaccf53479c765b9";
26-
sha256 = "1w4ly0i8mx7p5a3y25ml6j4vxz42vdcacx0fbv23najcz7qh3810";
25+
rev = "ccece6a4889e15850dfbaf6d5170939c83edb103";
26+
sha256 = "1hx5k0l9gniz9aj9li8dkiniqs77pyfcl979y75yqm3mynrdz9ca";
2727
};
2828
});
2929
in

0 commit comments

Comments
 (0)