Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
2ec5a67f
Commit
2ec5a67f
authored
Mar 30, 2016
by
jackgr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Makefile container build
parent
ff0308f4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
include.mk
rootfs/include.mk
+6
-3
No files found.
rootfs/include.mk
View file @
2ec5a67f
...
...
@@ -20,10 +20,10 @@ DOCKER_REGISTRY ?= gcr.io
DOCKER_PROJECT ?= $(PROJECT)
# Support both local and remote repos, and support no project.
ifdef $(DOCKER_PROJECT)
PREFIX := $(DOCKER_REGISTRY)/$(DOCKER_PROJECT)
else
ifeq ($(DOCKER_PROJECT),)
PREFIX := $(DOCKER_REGISTRY)
else
PREFIX := $(DOCKER_REGISTRY)/$(DOCKER_PROJECT)
endif
FULL_IMAGE := $(PREFIX)/$(IMAGE)
...
...
@@ -52,13 +52,16 @@ info:
push: container
ifeq ($(DOCKER_REGISTRY),gcr.io)
gcloud docker push $(FULL_IMAGE):$(TAG)
gcloud docker push $(FULL_IMAGE):latest
else
docker push $(FULL_IMAGE):$(TAG)
docker push $(FULL_IMAGE):latest
endif
.PHONY: container
container: .project .docker binary extras
docker build -t $(FULL_IMAGE):$(TAG) -f Dockerfile .
docker tag -f $(FULL_IMAGE):$(TAG) $(FULL_IMAGE):latest
.project:
ifeq ($(DOCKER_REGISTRY), gcr.io)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment