From d5c105791f005335c83ef4d4a5ea2f6eca8b9a77 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong <warmstrong@anl.gov> Date: Mon, 27 Apr 2020 16:28:39 -0500 Subject: [PATCH] modified: .gitlab-ci.yml modified: containers/docker/Makefile --- .gitlab-ci.yml | 2 +- containers/docker/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f56c093a0..85085dd4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ eic_docker: script: - cd containers/docker - make login - - make release + - make release-cached eic_singularity: stage: phase2 diff --git a/containers/docker/Makefile b/containers/docker/Makefile index 139aa1921..e66f3dffb 100644 --- a/containers/docker/Makefile +++ b/containers/docker/Makefile @@ -91,13 +91,13 @@ publish-latest: ## Publish the `latest` taged container to ECR @echo 'publish latest to $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME)' docker tag $(APP_NAME):latest $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):latest docker push $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):latest - docker rmi $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):latest + #docker rmi $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):latest publish-version: tag-version ## Publish the `{version}` taged container to ECR @echo 'publish latest to $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):$(VERSION)' docker tag $(APP_NAME):latest $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):$(VERSION) docker push $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):$(VERSION) - docker rmi $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):$(VERSION) + #docker rmi $(REG_NAME)/$(GL_REG_GROUP)/$(APP_NAME):$(VERSION) 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