gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dockerbuildpull' into 'master' 

Add --pull flag to docker build command

Fixes #1037 

See merge request !591
This commit is contained in:
Marin Jankovski 2016-01-11 09:23:41 +00:00
parent d86e65ac5d 9b4a523196
commit c9926773d7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ The latest version of this file can be found at the master branch of the
omnibus-gitlab repository.
- Add support for ecdsa and ed25519 keys to Docker image
- Pull the latest base image before building the GitLab Docker image
8.3.1

2
Makefile
View File

@ -87,7 +87,7 @@ docker_build: docker_cleanup
echo PACKAGECLOUD_REPO=$(PACKAGECLOUD_REPO) > docker/RELEASE
echo RELEASE_PACKAGE=$(RELEASE_PACKAGE) >> docker/RELEASE
echo RELEASE_VERSION=$(RELEASE_VERSION) >> docker/RELEASE
docker build -t $(RELEASE_PACKAGE):latest -f docker/Dockerfile docker/
docker build --pull -t $(RELEASE_PACKAGE):latest -f docker/Dockerfile docker/
docker_push:
docker tag -f $(RELEASE_PACKAGE):latest gitlab/$(RELEASE_PACKAGE):$(DOCKER_TAG)