osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

fix 'make -C subdir': use $(shell pwd) instead of $PWD 

$PWD does not get updated when make steps into a subdir. The pwd output does.
So obtain the current dir from shell pwd instead of $PWD.

So far, when doing 'make -C osmo-foo-maser', the image's name would be derived
from the root dir's basename and all images were tagged as 'docker-playground'.
With this fix, 'make -C' from anywhere still tags with the proper name.

Change-Id: I1dd0fd1ad89fdee18fdbea851ccc831ad60aeccf
This commit is contained in:
Neels Hofmeyr 2018-04-04 19:17:15 +02:00
parent 024458ce91
commit 71d197c031
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/Makefile
View File

@ -15,7 +15,7 @@
#
REGISTRY_HOST=docker.io
USERNAME=$(USER)
NAME=$(shell basename $(PWD))
NAME=$(shell basename $(shell pwd))
RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support
IMAGE=$(REGISTRY_HOST)/$(USERNAME)/$(NAME)