scottk/talos
1
0
Fork 0
mirror of https://github.com/lingble/talos.git synced 2025-12-16 20:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(ci): Update buildkit v0.5 (#594)

Browse Source 
Signed-off-by: Brad Beam <brad.beam@talos-systems.com>
This commit is contained in:
Brad Beam
2019-04-29 11:25:04 -05:00
committed by GitHub
parent 52f2fc92e5
commit e0122908a8
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.drone.yml
View File

@@ -44,8 +44,9 @@ steps:
pull: always pull: always
environment: environment:
BUILDKIT_HOST: tcp://buildkitd.ci.svc:1234 BUILDKIT_HOST: tcp://buildkitd.ci.svc:1234
BINDIR: /usr/local/bin
commands: commands:
- make - make drone
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run

16
Makefile
View File

@@ -8,7 +8,7 @@ INITRAMFS_IMAGE ?= autonomy/initramfs-base:255b4fd
# TODO(andrewrynhard): Move this logic to a shell script. # TODO(andrewrynhard): Move this logic to a shell script.
VPATH = $(PATH) VPATH = $(PATH)
BUILDKIT_VERSION ?= v0.4.0 BUILDKIT_VERSION ?= v0.5.0
BUILDKIT_IMAGE ?= moby/buildkit:$(BUILDKIT_VERSION) BUILDKIT_IMAGE ?= moby/buildkit:$(BUILDKIT_VERSION)
BUILDKIT_HOST ?= tcp://0.0.0.0:1234 BUILDKIT_HOST ?= tcp://0.0.0.0:1234
BUILDKIT_CACHE ?= -v $(HOME)/.buildkit:/var/lib/buildkit BUILDKIT_CACHE ?= -v $(HOME)/.buildkit:/var/lib/buildkit
@@ -41,7 +41,14 @@ DOCKER_ARGS ?=
# to allow tests to run containerd # to allow tests to run containerd
DOCKER_TEST_ARGS = --security-opt seccomp:unconfined --privileged -v /var/lib/containerd/ DOCKER_TEST_ARGS = --security-opt seccomp:unconfined --privileged -v /var/lib/containerd/
all: ci rootfs initramfs kernel installer talos all: ci drone
.PHONY: drone
drone: rootfs initramfs kernel installer talos
.PHONY: ci
ci: builddeps buildkitd
.PHONY: builddeps .PHONY: builddeps
builddeps: gitmeta buildctl builddeps: gitmeta buildctl
@@ -52,7 +59,7 @@ gitmeta:
buildctl: $(BINDIR)/buildctl buildctl: $(BINDIR)/buildctl
$(BINDIR)/buildctl: $(BINDIR)/buildctl:
@mkdir $(BINDIR) @mkdir -p $(BINDIR)
@wget -qO - $(BUILDCTL_ARCHIVE) | \ @wget -qO - $(BUILDCTL_ARCHIVE) | \
tar -zxf - -C $(BINDIR) --strip-components 1 bin/buildctl tar -zxf - -C $(BINDIR) --strip-components 1 bin/buildctl
@@ -78,9 +85,6 @@ ifneq ($(BUILDKIT_CONTAINER_RUNNING),$(BUILDKIT_CONTAINER_NAME))
endif endif
endif endif
.PHONY: ci
ci: builddeps buildkitd
.PHONY: binaries .PHONY: binaries
binaries: buildkitd binaries: buildkitd
@$(BINDIR)/buildctl --addr $(BUILDKIT_HOST) \ @$(BINDIR)/buildctl --addr $(BUILDKIT_HOST) \