Skip to content
Snippets Groups Projects
Commit 279a6062 authored by Bastien Abadie's avatar Bastien Abadie
Browse files

Merge branch 'makefile-branch' into 'master'

Pass Ponos and Common branch arguments to Docker build

See merge request !268
parents 0642fa79 b460c4ae
No related branches found
No related tags found
1 merge request!268Pass Ponos and Common branch arguments to Docker build
ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
TUNNEL_HOST:=arkindex-dev
TUNNEL_PORT:=8000
PONOS_BRANCH=master
COMMON_BRANCH=master
VERSION=$(shell git rev-parse --short HEAD)
TAG_APP=arkindex-app
......@@ -22,7 +24,7 @@ clean:
build:
python setup.py sdist
docker build --no-cache $(ROOT_DIR) -t $(TAG_APP):$(VERSION) -t $(TAG_APP):latest
docker build --no-cache $(ROOT_DIR) -t $(TAG_APP):$(VERSION) -t $(TAG_APP):latest --build-arg PONOS_BRANCH=$(PONOS_BRANCH) --build-arg COMMON_BRANCH=$(COMMON_BRANCH)
build-shell:
docker build -t $(TAG_SHELL):$(VERSION) -t $(TAG_SHELL):latest $(ROOT_DIR)/shell
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment