fix docker-build part with appropriate docker-login for new Dockerfile

This commit is contained in:
Matthew Jaffee 2021-09-09 12:34:48 -05:00
parent 59a4f26b03
commit 42eaf9e226
2 changed files with 12 additions and 4 deletions

View file

@ -163,7 +163,9 @@ jobs:
name: golang
steps:
- checkout-plus
- setup_remote_docker
- setup_remote_docker:
version: 19.03.13 # see https://support.circleci.com/hc/en-us/articles/360050934711
- run: echo -n $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
- run: make docker
- run: docker run pilosa:$(git describe --tags) help
dockerhub-upload-unstable:
@ -171,7 +173,9 @@ jobs:
name: golang
steps:
- checkout-plus
- setup_remote_docker
- setup_remote_docker:
version: 19.03.13 # see https://support.circleci.com/hc/en-us/articles/360050934711
- run: echo -n $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
- run: make docker
- run: docker run pilosa:$(git describe --tags) help
- run: docker login -u $DOCKER_USER -p $DOCKER_PASS
@ -181,7 +185,9 @@ jobs:
name: golang
steps:
- checkout-plus
- setup_remote_docker
- setup_remote_docker:
version: 19.03.13 # see https://support.circleci.com/hc/en-us/articles/360050934711
- run: echo -n $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
- run: make docker
- run: docker run pilosa:$(git describe --tags) help
- run: docker login -u $DOCKER_USER -p $DOCKER_PASS

View file

@ -196,7 +196,9 @@ generate: generate-protoc generate-statik generate-stringer generate-pql
# Create Docker image from Dockerfile
docker: vendor
docker build --build-arg BUILD_FLAGS="${FLAGS}" -t "pilosa:$(VERSION)" .
docker build \
--build-arg GO_VERSION=$(GO_VERSION) \
--tag pilosa:$(VERSION) .
@echo Created docker image: pilosa:$(VERSION)
# Tag and push a Docker image