push version-tagged images

mikedh · Feb 29, 2020 · 2ebcbfa · 2ebcbfa
1 parent 2c9f238
commit 2ebcbfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -71,11 +71,13 @@ jobs:
         export TRIMESH_VERSION=$(python -c "exec(open('trimesh/version.py','r').read()); print(__version__)")
         # tag the image with the short git sha
         export IMAGE_TAG=${GIT_SHA::7}
-        docker build -t mikedh/trimesh:latest -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
+        docker build -t mikedh/trimesh:latest -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest -t $ECR_REGISTRY/$ECR_REPOSITORY:$TRIMESH_VERSION .
         # push image to AWS ECR tagged by sha
         docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
         # push image to ECR tagged latest
         docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+        # push image to ECR tagged with trimesh version
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$TRIMESH_VERSION
     - name: Logout of registries
       if: always()
       run: |

diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ ENV PATH="/home/user/conda/bin:$PATH"
 # -p no:warnings suppresses 10,000 useless upstream warnings
 # -p no:alldep means that tests will fail if a dependency is missing
 # -x will exit on first test failure
-# RUN pytest -x -p no:warnings -p no:alldep /tmp/trimesh/tests
+RUN pytest -x -p no:warnings -p no:alldep /tmp/trimesh/tests
 
 # environment variables for software rendering
 ENV XVFB_WHD="1920x1080x24"\