Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to test repo #1053

Merged
merged 1 commit into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/DOCKERHUB-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down