diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-07-03 12:05:00 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-07-03 12:05:00 +0000 |
| commit | 59751fd1122d651ef1a05a6baf61718957a17ccc (patch) | |
| tree | 757e14059340fdcdeeb603a9c77d4b067103e3bc | |
| parent | db1e559fe44e215c5ae2cd03f9ba2556728f75b6 (diff) | |
| parent | fc060f9f97972d92a9b62f35f189d7c12cf5ad28 (diff) | |
Merge branch 'faster-docker-build' into 'master'
Speed up local docker-build
See merge request gitlab-org/security-products/license-management!179
| -rwxr-xr-x | bin/docker-build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/docker-build b/bin/docker-build index 2cd819f..ba694f1 100755 --- a/bin/docker-build +++ b/bin/docker-build @@ -4,9 +4,12 @@ set -e cd "$(dirname "$0")/.." +LATEST_IMAGE=${LATEST_IMAGE:='registry.gitlab.com/gitlab-org/security-products/license-management:latest'} +IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} + if command -v docker; then - IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} - docker build --network=host -t "$IMAGE_NAME" . + docker pull $LATEST_IMAGE + docker build --network=host --cache-from "$LATEST_IMAGE" -t "$IMAGE_NAME" . else echo "Install docker: https://docs.docker.com/engine/installation/" exit 1 |