Skip to content

fix typoed DOCKER_RUNNER var and var collision #111

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

Open
khous wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix typoed DOCKER_RUNNER var and var collision #111

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
2 changes: 1 addition & 1 deletion atlas/templates/Makefile.common.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SERVER_DOCKERFILE ?= $(DOCKERFILE_PATH)/Dockerfile
# configuration for the protobuf gentool
SRCROOT_ON_HOST ?= $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
SRCROOT_IN_CONTAINER ?= /go/src/$(PROJECT_ROOT)
DOCKER_RUNNER ?= docker run --rm -u `id -u`:`id -g` -e CGO_ENABLED=0 -w $(SRCROOT_IN_CONTAINER)-v $(SRCROOT_ON_HOST):$(SRCROOT_IN_CONTAINER)
DOCKER_RUNNER ?= docker run --rm -e CGO_ENABLED=0 -w $(SRCROOT_IN_CONTAINER) -v $(SRCROOT_ON_HOST):$(SRCROOT_IN_CONTAINER)
DOCKER_GENERATOR ?= infoblox/atlas-gentool:latest
GENERATOR ?= $(DOCKER_RUNNER) $(DOCKER_GENERATOR)

Expand Down
6 changes: 3 additions & 3 deletions atlas/templates/Makefile.vars.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ SERVER_DOCKERFILE := $(DOCKERFILE_PATH)/Dockerfile
# configuration for the protobuf gentool
SRCROOT_ON_HOST := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
SRCROOT_IN_CONTAINER := /go/src/$(PROJECT_ROOT)
DOCKER_RUNNER ?= docker run --rm -u `id -u`:`id -g` -e GOCACHE=/go -e CGO_ENABLED=0
DOCKER_RUNNER += -v $(SRCROOT_ON_HOST):$(SRCROOT_IN_CONTAINER)
DOCKER_RUNNER_VARS ?= docker run --rm -u `id -u`:`id -g` -e GOCACHE=/go -e CGO_ENABLED=0
DOCKER_RUNNER_VARS += -v $(SRCROOT_ON_HOST):$(SRCROOT_IN_CONTAINER)
DOCKER_GENERATOR := infoblox/atlas-gentool:latest
GENERATOR := $(DOCKER_RUNNER) $(DOCKER_GENERATOR)
GENERATOR := $(DOCKER_RUNNER_VARS) $(DOCKER_GENERATOR)
{{ if .WithDatabase }}
# configuration for the database
WITH_DATABASE = true
Expand Down