mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-11-29 14:41:09 +01:00
Code Issues Projects Releases Wiki Activity

docker-dev: add go version as build arg (#10117)

Browse Source
This commit is contained in:
Jason O'Donnell 2020-10-08 14:30:31 -04:00 committed by GitHub
parent b7ee07ae7e
commit 9204c47af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -53,10 +53,10 @@ dev-dynamic-mem: dev-dynamic
# Creates a Docker image by adding the compiled linux/amd64 binary found in ./bin. # Creates a Docker image by adding the compiled linux/amd64 binary found in ./bin.
# The resulting image is tagged "vault:dev". # The resulting image is tagged "vault:dev".
docker-dev: prep docker-dev: prep
docker build -f scripts/docker/Dockerfile -t vault:dev . docker build --build-arg VERSION=$(GO_VERSION_MIN) -f scripts/docker/Dockerfile -t vault:dev .
docker-dev-ui: prep docker-dev-ui: prep
docker build -f scripts/docker/Dockerfile.ui -t vault:dev-ui . docker build --build-arg VERSION=$(GO_VERSION_MIN) -f scripts/docker/Dockerfile.ui -t vault:dev-ui .
# test runs the unit tests and vets the code # test runs the unit tests and vets the code
test: prep test: prep

2
scripts/docker/Dockerfile
View File

@ -1,7 +1,7 @@
# Multi-stage builder to avoid polluting users environment with wrong # Multi-stage builder to avoid polluting users environment with wrong
# architecture binaries. Since this binary is used in an alpine container, # architecture binaries. Since this binary is used in an alpine container,
# we're explicitly compiling for 'linux/amd64' # we're explicitly compiling for 'linux/amd64'
ARG VERSION=1.13.10 ARG VERSION=1.14.7
FROM golang:${VERSION} AS builder FROM golang:${VERSION} AS builder

2
scripts/docker/Dockerfile.ui
View File

@ -3,7 +3,7 @@
# we're explicitly compiling for 'linux/amd64' # we're explicitly compiling for 'linux/amd64'
FROM debian:buster AS builder FROM debian:buster AS builder
ARG VERSION=1.13.10 ARG VERSION=1.14.7
ARG CGO_ENABLED=0 ARG CGO_ENABLED=0
ARG BUILD_TAGS ARG BUILD_TAGS
ENV JOBS=2 ENV JOBS=2