Skip to content

ref(*): refactor targets into logically different makefiles #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arschles merged 1 commit into from
Jan 15, 2016
Merged

ref(*): refactor targets into logically different makefiles #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,24 @@ kube-mc-integration:
build-server:
docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.5.2 ./install.sh

build-mc:
docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/mc":/pwd -w /pwd golang:1.5.2 ./install.sh
# targets for mc

docker-build-mc:
docker build -t ${MC_IMAGE} mc
mc-build:
make -C mc build

docker-push-mc:
docker push ${MC_IMAGE}
perl -pi -e "s|image: [a-z0-9.:]+\/deis\/mc:[0-9a-z-.]+|image: ${MC_IMAGE}|g" manifests/deis-mc-pod.yaml
mc-docker-build:
make -C mc docker-build

docker-build-mc-integration:
docker build -t ${MC_INTEGRATION_IMAGE} mc
mc-docker-push:
make -C mc docker-push

docker-push-mc-integration:
docker push ${MC_INTEGRATION_IMAGE}
perl -pi -e "s|image: [a-z0-9.:]+\/deis\/mc-integration:[0-9a-z-.]+|image: ${MC_INTEGRATION_IMAGE}|g" manifests/deis-mc-integration-pod.yaml
# targets for the mc integration tests

mc-integration-docker-build:
make -C mc/integration docker-build

mc-integration-docker-push:
make -C mc/integration docker-push

test:
@echo "Implement functional tests in _tests directory"
Expand Down
2 changes: 1 addition & 1 deletion mc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update -y && apt-get install -y -q ca-certificates
ADD mc /bin/mc

ENV DEIS_RELEASE=2.0.0-dev
ADD ./integration.sh /bin/integration.sh
ADD ./integration/integration.sh /bin/integration.sh
RUN chmod +x /bin/integration.sh

# this is so the minio client (https://github.com/minio/mc) works properly
Expand Down
16 changes: 16 additions & 0 deletions mc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
DEV_REGISTRY ?= $(docker-machine ip deis):5000
DEIS_REGISTRY ?= ${DEV_REGISTRY}
IMAGE_PREFIX ?= deis
VERSION ?= git-$(shell git rev-parse --short HEAD)

MC_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION}
MC_INTEGRATION_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION}

build:
docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v ${CURDIR}:/pwd -w /pwd golang:1.5.2 ./install.sh

docker-build:
docker build -t ${MC_IMAGE} ${CURDIR}

docker-push:
docker push ${MC_IMAGE}
12 changes: 12 additions & 0 deletions mc/integration/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
DEV_REGISTRY ?= $(docker-machine ip deis):5000
DEIS_REGISTRY ?= ${DEV_REGISTRY}
IMAGE_PREFIX ?= deis
VERSION ?= git-$(shell git rev-parse --short HEAD)

IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc-integration:${VERSION}

docker-build:
docker build -t ${IMAGE} ${CURDIR}/..

docker-push:
docker push ${IMAGE}
0 mc/integration.sh → mc/integration/integration.sh
View file
Open in desktop
File renamed without changes.