Upgrade LinuxKit
This commit is contained in:
parent
dfce260641
commit
72b8c1d32c
25 changed files with 135 additions and 27 deletions
54
Makefile
54
Makefile
|
|
@ -1,84 +1,86 @@
|
|||
LINUXKIT ?= $(GOPATH)/bin/linuxkit
|
||||
|
||||
tuto1: token-validator/token-validator server.iso
|
||||
|
||||
pkg/login-app: pkg/login-app/cmd/login.go pkg/login-app/cmd/dialog-checklogin.go pkg/login-app/cmd/cmd pkg/login-app/cmd/dialog-login.go pkg/login-app/cmd/login-app pkg/login-app/cmd/dialog-errmsg.go pkg/login-app/cmd/main.go pkg/login-app/cmd/stream.go pkg/login-app/cmd/cinematic.go pkg/login-app/build.yml pkg/login-app/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/login-app/
|
||||
#linuxkit pkg push -org nemunaire --sign=false pkg/login-app/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/login-app/
|
||||
#$(LINUXKIT) pkg push -org nemunaire --sign=false pkg/login-app/
|
||||
touch pkg/login-app
|
||||
|
||||
login-initrd.img: login.yml pkg/login-app
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
|
||||
token-validator/token-validator: token-validator/*.go
|
||||
go generate ./token-validator
|
||||
GOOS=linux GOARM=5 GOARCH=arm go build -tags netgo -ldflags '-w -extldflags "-static"' -o $@ ./token-validator
|
||||
|
||||
challenge: pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
|
||||
linuxkit pkg build -org nemunaire pkg/challenge/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/challenge/
|
||||
|
||||
challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
|
||||
|
||||
pkg/arp-spoofer: pkg/arp-spoofer/cmd/main.go pkg/arp-spoofer/cmd/arp.go pkg/arp-spoofer/build.yml pkg/arp-spoofer/Dockerfile
|
||||
linuxkit pkg build -org nemunaire $@
|
||||
$(LINUXKIT) pkg build -org nemunaire $@
|
||||
touch $@
|
||||
|
||||
pkg/login-validator: pkg/login-validator/cmd/login.go pkg/login-validator/cmd/main.go pkg/login-validator/cmd/pxetpl.go pkg/login-validator/cmd/logout.go pkg/login-validator/cmd/auth.go pkg/login-validator/cmd/arp.go pkg/login-validator/cmd/auth_krb5.go pkg/login-validator/cmd/auth_ldap.go pkg/login-validator/cmd/students.go pkg/login-validator/cmd/auth_fwd.go pkg/login-validator/cmd/ssh.go pkg/login-validator/build.yml pkg/login-validator/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/login-validator/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/login-validator/
|
||||
touch pkg/login-validator
|
||||
|
||||
pkg/monit: pkg/monit/build.yml pkg/monit/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/monit/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/monit/
|
||||
touch pkg/monit
|
||||
|
||||
pkg/postfix: pkg/postfix/build.yml pkg/postfix/docker-entrypoint.sh pkg/postfix/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/postfix/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/postfix/
|
||||
touch pkg/postfix
|
||||
|
||||
pkg/tftpd: pkg/tftpd/build.yml pkg/tftpd/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/tftpd/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/tftpd/
|
||||
touch pkg/tftpd
|
||||
|
||||
pkg/unbound: pkg/unbound/build.yml pkg/unbound/docker-entrypoint.sh pkg/unbound/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/unbound/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/unbound/
|
||||
touch pkg/unbound
|
||||
|
||||
pkg/wg-manager: pkg/wg-manager/cmd/register.go pkg/wg-manager/cmd/main.go pkg/wg-manager/build.yml pkg/wg-manager/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/wg-manager/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/wg-manager/
|
||||
touch pkg/wg-manager
|
||||
|
||||
server.iso: server.yml students.csv ssl/fullchain.pem ssl/privkey.pem challenge-initrd.img pkg/arp-spoofer pkg/login-validator pkg/monit pkg/postfix pkg/tftpd pkg/unbound pkg/wg-manager challenge-kernel login-initrd.img
|
||||
linuxkit build -docker -format iso-bios $<
|
||||
$(LINUXKIT) build -docker -format iso-bios $<
|
||||
|
||||
pkg/debian-tuto2: pkg/debian-tuto2/sshd_config pkg/debian-tuto2/gai.conf pkg/debian-tuto2/isolinux.cfg pkg/debian-tuto2/build.yml pkg/debian-tuto2/default.script pkg/debian-tuto2/issue pkg/debian-tuto2/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/debian-tuto2/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/debian-tuto2/
|
||||
touch pkg/debian-tuto2
|
||||
|
||||
pkg/debian-tuto3: pkg/debian-tuto3/sshd_config pkg/debian-tuto3/build.yml pkg/debian-tuto3/issue pkg/debian-tuto3/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/debian-tuto3/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/debian-tuto3/
|
||||
touch pkg/debian-tuto3
|
||||
|
||||
pkg/router-tuto3: pkg/router-tuto3/build.yml pkg/router-tuto3/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/router-tuto3/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/router-tuto3/
|
||||
touch pkg/router-tuto3
|
||||
|
||||
pkg/tinydeb: pkg/tinydeb/sshd_config pkg/tinydeb/gai.conf pkg/tinydeb/build.yml pkg/tinydeb/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/tinydeb/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/tinydeb/
|
||||
touch pkg/tinydeb
|
||||
|
||||
pkg/nsd: pkg/nsd/sshd_config pkg/nsd/build.yml pkg/nsd/init pkg/nsd/Dockerfile
|
||||
linuxkit pkg build -org nemunaire pkg/tinydeb/
|
||||
$(LINUXKIT) pkg build -org nemunaire pkg/tinydeb/
|
||||
touch pkg/nsd
|
||||
|
||||
tuto2-kernel: tuto2.yml
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
tuto2-initrd.img: tuto2.yml
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
tuto2-cmdline: tuto2.yml
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
|
||||
tuto2.iso: tuto2.yml pkg/debian-tuto2 tuto2-kernel tuto2-initrd.img tuto2-cmdline
|
||||
linuxkit build -docker -format iso-bios $<
|
||||
$(LINUXKIT) build -docker -format iso-bios $<
|
||||
|
||||
tuto2-srs.iso: tuto2.iso pkg/debian-tuto2/isolinux.cfg
|
||||
$(eval TDIR := $(shell mktemp -d))
|
||||
|
|
@ -93,14 +95,14 @@ tuto2-srs.iso: tuto2.iso pkg/debian-tuto2/isolinux.cfg
|
|||
|
||||
|
||||
tuto3-kernel: tuto3.yml
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
tuto3-initrd.img: tuto3.yml
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
tuto3-cmdline: tuto3.yml
|
||||
linuxkit build -docker $<
|
||||
$(LINUXKIT) build -docker $<
|
||||
|
||||
tuto3.iso: tuto3.yml pkg/debian-tuto3 pkg/router-tuto3 pkg/tinydeb pkg/unbound pkg/nsd
|
||||
linuxkit build -docker -format iso-bios $<
|
||||
$(LINUXKIT) build -docker -format iso-bios $<
|
||||
|
||||
|
||||
%.gz: %
|
||||
|
|
|
|||
Reference in a new issue