codevalet
/
codevalet
mirror of https://github.com/codevalet/codevalet
1
0
Fork 0
Code Issues Releases Wiki Activity

Move things around so the master will build properly with the init.groovy.d and plugins

This commit is contained in:
R. Tyler Croy 2017-07-18 20:54:18 -07:00
parent e3866f19a8
commit e3d254a115
No known key found for this signature in database
GPG Key ID: 1426C7DC3F51E16F
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
docker/Dockerfile.builder → Dockerfile.builder
View File

0
docker/Dockerfile.master → Dockerfile.master
View File

18
Makefile
View File

@ -1,15 +1,15 @@
IMAGE_PREFIX="rtyler/codevalet"
all: plugins master
all: master
builder:
$(MAKE) -C docker builder
master:
$(MAKE) -C docker master
plugins: ./scripts/build-plugins master
plugins: ./scripts/build-plugins builder
./scripts/build-plugins
builder: Dockerfile.builder
docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
master: Dockerfile.master
docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
.PHONY: clean all plugins master builder

12
docker/Makefile
View File

@ -1,12 +0,0 @@
IMAGE_PREFIX="rtyler/codevalet"
all: builder master
builder: Dockerfile.builder
docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
master: Dockerfile.master
docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
.PHONY: clean all builder master