From 1acdee441b0029b5606182483cd5f7f7ea8ce6f5 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Thu, 15 Aug 2019 16:13:54 -0500
Subject: [PATCH] modified: ../../.gitlab-ci.yml modified:
Makefile
---
.gitlab-ci.yml | 4 ----
containers/docker/Makefile | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d85184c..f0d7ce1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,6 @@ hcana_docker:
script:
- docker login eicweb.phy.anl.gov -u whit -p ${CI_IMAGE_BUILD_PAT}
- cd containers/docker && make release
- #- docker push eicweb.phy.anl.gov:4567/jlab/hcana
- # - docker login eicweb.phy.anl.gov:4567 -u whit -p ${eic0_registry_push_token}
- # - docker tag whit/image_recipes/ubuntu_base:latest eicweb.phy.anl.gov:4567/whit/image_recipes/ubuntu_base:latest
- # - docker push eicweb.phy.anl.gov:4567/whit/image_recipes/ubuntu_base:latest
hcana_singularity:
diff --git a/containers/docker/Makefile b/containers/docker/Makefile
index b09314c..c74d224 100644
--- a/containers/docker/Makefile
+++ b/containers/docker/Makefile
@@ -89,9 +89,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)
-release: build-nc publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
+release: build 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
+publish: publish-latest #publish-version ## Publish the `{version}` ans `latest` tagged containers to ECR
push: login ## push after login @echo 'push latest to $(REG_NAME)/$(REPO)/$(APP_NAME):latest'
docker tag $(APP_NAME):latest $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):latest
--
GitLab