From 0a84eaabac1d8a7510f6075da6a35da57c754d5e Mon Sep 17 00:00:00 2001 From: Whitney Armstrong <warmstrong@anl.gov> Date: Thu, 15 Aug 2019 13:05:03 -0500 Subject: [PATCH] modified: Makefile modified: config.env --- containers/docker/Makefile | 4 ++-- containers/docker/config.env | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/containers/docker/Makefile b/containers/docker/Makefile index 010286f..1cc2c7b 100644 --- a/containers/docker/Makefile +++ b/containers/docker/Makefile @@ -87,9 +87,9 @@ tag-alt-version: ## Generate container `{version}` tag # ========================================================================== # login: ## Auto login to AWS-ECR unsing aws-cli - @docker login $(REG_NAME) -u $(REG_USER) -p $(REG_TOKEN) + docker login $(REG_NAME) -u $(REG_USER) -p $(REG_TOKEN) -release: build publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR +release: build-nc publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR publish: login publish-latest #publish-version ## Publish the `{version}` ans `latest` tagged containers to ECR diff --git a/containers/docker/config.env b/containers/docker/config.env index 52fc836..2828dff 100644 --- a/containers/docker/config.env +++ b/containers/docker/config.env @@ -4,6 +4,7 @@ PORT=4000 REG_TOKEN ?= ${CI_IMAGE_BUILD_PAT} REG_USER ?= whit REG_NAME ?= eicweb.phy.anl.gov:4567 +REG_HOST ?= eicweb.phy.anl.gov # name of alternate build: # Dockerfile.$(ALT_NAME) --> $(APP_NAME)_${ALT_NAME} -- GitLab