From 04e2d9f81ea0b7e5e4766b9aa7322f8a6e6c5547 Mon Sep 17 00:00:00 2001 From: Bob Farrell Date: Sun, 28 Mar 2021 00:01:46 +0000 Subject: [PATCH] Fix dev build condition --- Makefile | 3 +-- app/Makefile | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c2896bc..0e1f709 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,7 @@ build: .PHONY: push push: -ifneq (1,$(dev)) - $(MAKE) push-dev +ifeq (1,$(dev)) docker push skep/agent:dev docker push skep/monitor:dev docker push skep/app:dev diff --git a/app/Makefile b/app/Makefile index d2a85ee..8cd0c16 100644 --- a/app/Makefile +++ b/app/Makefile @@ -3,7 +3,6 @@ all: mkdir -p .build/ ifeq (${dev},1) cp Dockerfile Pipfile Pipfile.lock .build/ - rm -f .build/build.tar tar zcf .build/build.tar --exclude build.tar --exclude .build --exclude node_modules . cp -r ../shared/skep .build/skep cd .build/ && docker build . -t skep/app:dev