Compare commits

..

No commits in common. "a7602eed6e78cd7ff46b69ddc53cdb6043430266" and "c60976a06a65d63d841e057b8c803310b2ac2258" have entirely different histories.

3 changed files with 18 additions and 40 deletions

View File

@ -1,8 +1,7 @@
TMUX_SESSION=knowyt TMUX_SESSION=knowyt
VERSION=$(shell grep version client/package.json | cut -d\" -f4) VERSION=$(shell grep version client/package.json | cut -d\" -f4)
CONTAINER=$(shell which podman || which docker)
.PHONY: info setup run-all run-server run-client run-tmux build clean .PHONY: info run-all run-server run-client run-tmux build podman clean
info: info:
@echo available targets: @echo available targets:
@ -10,16 +9,9 @@ info:
setup: setup:
@echo "I checking for tools" @echo "I checking for tools"
@echo -n " container: " ; \
if ! [ -x "$(CONTAINER)" ]; then \
echo "neither podman nor docker found" ;\
exit 1 ;\
else \
echo "$(CONTAINER)" ;\
fi
@for binary in go go-bindata tmux node pnpm npx \ @for binary in go go-bindata tmux node pnpm npx \
pexec inotifyloop inotifywait \ pexec inotifyloop inotifywait \
newuidmap slirp4netns; do \ podman newuidmap slirp4netns; do \
echo -n " $$binary: " ; \ echo -n " $$binary: " ; \
if ! which "$$binary"; then \ if ! which "$$binary"; then \
echo "not found" ;\ echo "not found" ;\
@ -58,27 +50,28 @@ build:
echo $(VERSION) echo $(VERSION)
(cd client/ && pnpm run generate) (cd client/ && pnpm run generate)
$(MAKE) -C server build $(MAKE) -C server build
$(MAKE) container-build $(MAKE) podman-build
$(MAKE) podman-save
container-build: podman-build:
mkdir -p build/files/data mkdir -p build/files/data
cp server/knowyt build/files/ cp server/knowyt build/files/
$(CONTAINER) build --tag knowyt:$(VERSION) . podman build --tag knowyt:$(VERSION) .
container-save: podman-save:
rm -f build/knowyt-$(VERSION).tar rm -f build/knowyt-$(VERSION).tar
$(CONTAINER) save knowyt:$(VERSION) -o build/knowyt-$(VERSION).tar podman save knowyt:$(VERSION) -o build/knowyt-$(VERSION).tar
ls -lh build/knowyt-$(VERSION).tar ls -lh build/knowyt-$(VERSION).tar
container-run: podman-run:
$(CONTAINER) run --rm -it -p 8080:32039 -v $$(pwd)/server/data/:/data --name knowyt knowyt:$(VERSION) podman run --rm -it -p 32039:32039 -v $$(pwd)/server/data/:/data --name knowyt knowyt:$(VERSION)
container-stop: podman-stop:
$(CONTAINER) stop knowyt podman stop knowyt
container-publish: podman-publish:
$(CONTAINER) push knowyt:$(VERSION) docker.io/settel/knowyt:$(VERSION) podman push knowyt:$(VERSION) docker.io/settel/knowyt:$(VERSION)
$(CONTAINER) push knowyt:$(VERSION) docker.io/settel/knowyt:latest podman push knowyt:$(VERSION) docker.io/settel/knowyt:latest
clean: clean:
rm -rf client/.output/ rm -rf client/.output/

View File

@ -1,13 +1,6 @@
# Know Your Teammates # Know Your Teammates
Know Your Teammates is a free team building game for 3-20 players that can be played in a browser. [Watch video (3:33mins)](https://www.sirlab.de/knowyt/know-your-teammates.mp4)
It has two phases: during collection phase, the players are asked to enter 3-5 facts about themselves, eg. hobbies, books, movies they enjoy, places they have visited or other fun facts. In play phase, one fact is presented to all players and they have to guess who wrote it. The real fun is in the discussion following it :-)
[Watch video (3:30mins)](https://www.sirlab.de/knowyt/know-your-teammates.mp4)
See Website https://www.sirlab.de/linux/games/knowyt/
## Installation ## Installation
@ -27,19 +20,11 @@ start client and server in a split terminal window
make run-tmux make run-tmux
``` ```
This will start frontend (port 3000) and backend (port 32039) as two separate services. Hot reload is active, changes will take effect immediately.
Point your browser at [http://localhost:3000/](http://localhost:3000/) to start playing. ## build podman/docker image
## build and run podman/docker image
``` ```
make setup # only needed on first run
make build make build
make container-run
``` ```

View File

@ -1,6 +1,6 @@
{ {
"name": "knowyt", "name": "knowyt",
"version": "3.4", "version": "3.3",
"private": true, "private": true,
"scripts": { "scripts": {
"lint": "tsc-strict", "lint": "tsc-strict",