Merge pull request #4979 from camptocamp/clean-dockerhub-tags

Reactivate clean Docker hub tags
camptocamp · Jun 6, 2019 · 0c70b87 · 0c70b87
2 parents a339416 + dac94f3
commit 0c70b87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -171,11 +171,11 @@ jobs:
             git config user.email "<[email protected]>"
             git config user.name "CI"
             git fetch push
+      - run:
+          name: Clean Docker hub tags
+          command: ci/clean-dockerhub-tags
       - deploy: &publish-docker-pip
           name: Push to Docker hub and Pypi
-          # git remote add full https://github.com/camptocamp/c2cgeoportal.git || true
-          # git fetch --tags --prune
-          # ci/clean-dockerhub-tags
           command: |
             docker build --target=builder --tag=camptocamp/geomapfish-build \
             --build-arg=MAJOR_VERSION=${MAJOR_VERSION} .

diff --git a/ci/clean-dockerhub-tags b/ci/clean-dockerhub-tags
@@ -64,8 +64,7 @@ def clean_images(image, tag_=lambda tag: tag):
             }
         )
 
-
-for image in ["geomapfish-build", "geomapfish-build-dev", "geomapfish-geoportal"]:
+for image in ["geomapfish", "geomapfish-build", "geomapfish-scaffolds", "geomapfish-geoportal"]:
     clean_images(image)
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,8 +64,7 @@ def clean_images(image, tag_=lambda tag: tag): @@
                 }
             )
-    for image in ["geomapfish-build", "geomapfish-build-dev", "geomapfish-geoportal"]:
+    for image in ["geomapfish", "geomapfish-build", "geomapfish-scaffolds", "geomapfish-geoportal"]:
         clean_images(image)
@@ Expand Down @@