Merge pull request #1053 from jonocodes/remove-jonocodes-refs

Remove references to test repo

Makefile

@@ -1,13 +1,15 @@
+
+DOCKERHUB_REPO=cypht/cypht
+
 .PHONY: docker-up
 docker-up:  ## start docker stack in foreground for development
 	docker compose -f docker-compose.dev.yaml up --build || true # --abort-on-container-exit
 
 .PHONY: docker-push
 .ONESHELL:
 docker-push:  ## build, tag, and push image to dockerhub. presumes you are logged in. run with a version like tag:1.2.3
-	@username=$$(docker info | sed '/Username:/!d;s/.* //')
 	@[ "$(tag)" = "" ] && (echo "Tag required. Example tag=1.2.3" ; exit 1)
-	@image=$${username}/cypht:$(tag)
+	@image=$(DOCKERHUB_REPO):$(tag)
 	@echo "Building image $${image}"
 	@docker buildx build . --platform linux/amd64 \
 		-t $${image} -f docker/Dockerfile --push
@@ -16,9 +18,7 @@ docker-push:  ## build, tag, and push image to dockerhub. presumes you are logge
 .PHONY: dockerhub-push-readme
 .ONESHELL:
 dockerhub-push-readme:  ## upload readme to dockerhub
-	@username=$$(docker info | sed '/Username:/!d;s/.* //')
-	@docker pushrm --file docker/DOCKERHUB-README.md $${username}/cypht
-	@echo docker pushrm --file docker/DOCKERHUB-README.md $${username}/cypht
+	docker pushrm --file docker/DOCKERHUB-README.md $(DOCKERHUB_REPO)
 
 .PHONY: setup
 .ONESHELL:

docker/DOCKERHUB-README.md

@@ -15,7 +15,7 @@ It recommended that you choose a specific version number tag instead of using 'l
 ## Example docker-compose
 
 See example file here:
-https://github.com/jonocodes/cypht/blob/docker-refresh/docker/docker-compose.yaml
+https://github.com/cypht-org/cypht/blob/master/docker/docker-compose.yaml
 
 * Starts a database container to be for user authentication
 * Starts the Cypht container available on port 80 of the host with ...

docker/docker-compose.yaml

@@ -14,7 +14,7 @@ services:
       - MYSQL_USER=cypht
       - MYSQL_PASSWORD=cypht_password
   cypht:
-    image: jonocodes/cypht:2.0.1-docker-wip
+    image: cypht/cypht:2.0.1
     ports:
       - "80:80"
     # env_file: