Skip to content

K
k3s
Commit bf4f6f70 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Wait for docker to start before running dapper

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit 9bdab191) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent ecb1c16d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
Makefile
View file @ bf4f6f70
TARGETS := $(shell ls scripts | grep -v \\.sh) TARGETS := $(shell ls scripts | grep -v \\.sh)
GO_FILES ?= $$(find . -name '*.go' | grep -v generated) GO_FILES ?= $$(find . -name '*.go' | grep -v generated)
SHELL := /bin/bash
.dapper: .dapper:
...@@ -9,7 +10,11 @@ GO_FILES ?= $$(find . -name '*.go' | grep -v generated) ...@@ -9,7 +10,11 @@ GO_FILES ?= $$(find . -name '*.go' | grep -v generated)
@./.dapper.tmp -v @./.dapper.tmp -v
@mv .dapper.tmp .dapper @mv .dapper.tmp .dapper
$(TARGETS): .dapper .PHONY: docker.sock
docker.sock:
while ! docker version 1>/dev/null; do sleep 1; done
$(TARGETS): .dapper docker.sock
./.dapper $@ ./.dapper $@
.PHONY: deps .PHONY: deps
...@@ -42,4 +47,4 @@ format: ...@@ -42,4 +47,4 @@ format:
local: local:
DOCKER_BUILDKIT=1 docker build \ DOCKER_BUILDKIT=1 docker build \
--build-arg="REPO TAG GITHUB_TOKEN GOLANG GOCOVER DEBUG" \ --build-arg="REPO TAG GITHUB_TOKEN GOLANG GOCOVER DEBUG" \
-t k3s-local -f Dockerfile.local --output=. . -t k3s-local -f Dockerfile.local --output=. .
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment