Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Commit

Permalink
Fix 487 makefile changes (#490)
Browse files Browse the repository at this point in the history
Fix 487 makefile changes
  • Loading branch information
stealthybox authored Nov 11, 2019
2 parents 3ea5d3c + 1371f41 commit b0469c3
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ SHELL:=/bin/bash
DOCKER := docker
# Set the first containerd.sock that successfully stats -- fallback to the docker4mac default
CONTAINERD_SOCK := $(shell \
ls 2>/dev/null \
$(DOCKER) run -i --rm \
-v /run:/run:ro \
-v /var/run:/var/run:ro \
busybox:latest \
ls 2>/dev/null \
/run/containerd/containerd.sock \
/run/docker/containerd/containerd.sock \
/var/run/containerd/containerd.sock \
Expand Down Expand Up @@ -68,10 +72,15 @@ endif
E2E_REGEX := Test
E2E_COUNT := 1

all: ignite
# Default is to build all the binaries for this architecture
all: build-all-$(GOARCH)

install: ignite
sudo cp bin/$(GOARCH)/ignite /usr/local/bin

install-all: install ignited
sudo cp bin/$(GOARCH)/ignited /usr/local/bin

BINARIES = ignite ignited ignite-spawn
$(BINARIES):
$(MAKE) shell COMMAND="make bin/$(GOARCH)/$@"
Expand Down Expand Up @@ -217,7 +226,7 @@ dockerized-autogen: /go/bin/deepcopy-gen /go/bin/defaulter-gen /go/bin/conversio
--input-dirs ${API_DIRS} \
-O zz_generated.conversion \
-h /tmp/boilerplate

/go/bin/openapi-gen \
--input-dirs ${API_DIRS} \
--output-package ${PROJECT}/pkg/openapi \
Expand Down

0 comments on commit b0469c3

Please sign in to comment.