Skip to content

Commit be3c7bf

Browse files
authored
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>
1 parent 59ec942 commit be3c7bf

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ jobs:
6767
if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }}
6868
env:
6969
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
70-
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
7170
DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
7271
run: make push
7372

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ REPO_NAME ?= postgis
5656
IMAGE_NAME ?= postgis
5757

5858
DOCKER=docker
59-
DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:2.1.0
59+
DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:latest
6060

6161
GIT=git
6262
OFFIMG_LOCAL_CLONE=$(HOME)/official-images
@@ -137,7 +137,7 @@ push-latest: tag-latest $(PUSH_LATEST_DEP)
137137
$(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):latest
138138
@$(DOCKER) run -v "$(PWD)":/workspace \
139139
-e DOCKERHUB_USERNAME='$(DOCKERHUB_USERNAME)' \
140-
-e DOCKERHUB_PASSWORD='$(DOCKERHUB_PASSWORD)' \
140+
-e DOCKERHUB_PASSWORD='$(DOCKERHUB_ACCESS_TOKEN)' \
141141
-e DOCKERHUB_REPOSITORY='$(REPO_NAME)/$(IMAGE_NAME)' \
142142
-e README_FILEPATH='/workspace/README.md' $(DOCKERHUB_DESC_IMG)
143143

0 commit comments

Comments
 (0)