Skip to content
This repository was archived by the owner on Jun 29, 2021. It is now read-only.

Commit a67d22c

Browse files
chore(Makefile): clean up and update makefile (#90)
1 parent c6dbce4 commit a67d22c

3 files changed

Lines changed: 2 additions & 49 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ services:
88
- docker
99
sudo: required
1010
script:
11-
- make bootstrap test docker-build
11+
- make docker-build

Dockerfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,14 @@
1-
# Short name: Short name, following [a-zA-Z_], used all over the place.
2-
# Some uses for short name:
3-
# - Docker image name
4-
# - Kubernetes service, rc, pod, secret, volume names
51
SHORT_NAME := dockerbuilder
6-
7-
# Enable vendor/ directory support.
8-
export GO15VENDOREXPERIMENT=1
9-
10-
# Common flags passed into Go's linker.
11-
LDFLAGS := "-s -X main.version=${VERSION}"
12-
13-
# Docker Root FS
14-
BINDIR := ./rootfs
15-
16-
# Legacy support for DEV_REGISTRY, plus new support for DEIS_REGISTRY.
17-
DEV_REGISTRY ?= $(eval docker-machine ip deis):5000
18-
DEIS_REGISTY ?= ${DEV_REGISTRY}/
2+
DEIS_REGISTY ?= quay.io/
193
IMAGE_PREFIX ?= deis
204

215
include versioning.mk
226

23-
all:
24-
@echo "Use a Makefile to control top-level building of the project."
25-
267
# For cases where we're building from local
278
docker-build:
289
docker build --rm -t ${IMAGE} rootfs
2910
docker tag ${IMAGE} ${MUTABLE_IMAGE}
3011

31-
# Deploy is a Kubernetes-oriented target
32-
deploy: kube-service kube-rc
33-
34-
# Some things, like services, have to be deployed before pods. This is an
35-
# example target. Others could perhaps include kube-secret, kube-volume, etc.
36-
kube-service:
37-
kubectl create -f ${SVC}
38-
39-
# When possible, we deploy with RCs.
40-
kube-rc:
41-
kubectl create -f ${RC}
42-
43-
kube-clean:
44-
kubectl delete rc deis-example
45-
46-
bootstrap:
47-
@echo Nothing to do.
48-
4912
test:
5013
@echo "Implement functional tests in _tests directory"
5114

0 commit comments

Comments
 (0)