Update master versions and fix CI (#305)

* make update: updates (13|14|15beta2)-master

* switch CI to use latest dockerhub description update image and dockerhub access token instead of password

Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com>

Author: phillipross

.github/workflows/main.yml

@@ -67,7 +67,6 @@ jobs:
       if: ${{  (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request')  }}
       env:
         DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
         DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
       run: make push
 

Makefile

@@ -56,7 +56,7 @@ REPO_NAME  ?= postgis
 IMAGE_NAME ?= postgis
 
 DOCKER=docker
-DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:2.1.0
+DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:latest
 
 GIT=git
 OFFIMG_LOCAL_CLONE=$(HOME)/official-images
@@ -137,7 +137,7 @@ push-latest: tag-latest $(PUSH_LATEST_DEP)
 	$(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):latest
 	@$(DOCKER) run -v "$(PWD)":/workspace \
                       -e DOCKERHUB_USERNAME='$(DOCKERHUB_USERNAME)' \
-                      -e DOCKERHUB_PASSWORD='$(DOCKERHUB_PASSWORD)' \
+                      -e DOCKERHUB_PASSWORD='$(DOCKERHUB_ACCESS_TOKEN)' \
                       -e DOCKERHUB_REPOSITORY='$(REPO_NAME)/$(IMAGE_NAME)' \
                       -e README_FILEPATH='/workspace/README.md' $(DOCKERHUB_DESC_IMG)