diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d85184c6a04776dc9979c076f552aa6644c3cd58..f0d7ce194dae7aa7cd5d11b41988e2e1f9e17273 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 b09314c7b1e5bf31b3f8110f1b25eef2eea7f572..c74d224fca207288b4b8013cb249d583c3cfaaa9 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