diff --git a/Makefile b/Makefile index af5a7d0..edc56b9 100644 --- a/Makefile +++ b/Makefile @@ -90,14 +90,17 @@ ensure-git-clean: ## Ensure git is clean exit 1; \ fi -.PHONY: bump-version -previousVersion=$(shell head -n 1 ./VERSION) -bump-version: ensure-git-clean ## Bump images version for docker-compose +.PHONY: update-docker-compose-version +update-docker-compose-version: ## Update images version for docker-compose @for target in $(TARGETS); do \ for registry in $(REGISTRIES); do \ - image=$${registry}$(IMAGE_PREFIX)$${target}$(IMAGE_SUFFIX):$(VERSION); \ - $(SED) -i "s#$(image):$(previousVersion)#$(image):$(VERSION)#g" docker-compose.yaml; \ + image=$${registry}$(IMAGE_PREFIX)$${target}$(IMAGE_SUFFIX); \ + $(SED) -i -E "s#image: $${image}:[^ ]+#image: $${image}:$(VERSION)#g" docker-compose.yaml; \ done; \ done + +.PHONY: bump-version +previousVersion=$(shell head -n 1 ./VERSION) +bump-version: ensure-git-clean update-docker-compose-version ## Bump images version for docker-compose echo $(VERSION) > ./VERSION @echo "PLEASE using 'git commit -a' to commit image version changes" diff --git a/README.md b/README.md index 95667ba..c768480 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,23 @@ git clone --recursive git@github.com:alswl/excalidraw-collaboration.git cd excalidraw-collaboration git config submodule.excalidraw.ignore all # ignore submodule changes, we will patch them -make patch images -git commit -a -m 'feat: new image' -make bump-version -docker-compose up +# $EDITOR excalidraw.env.production # (optional) edit service endpoint + +make patch images # patch to configurations and build the container image +make update-docker-compose-version # update images version for docker-compose +docker-compose up # run the containers + +open "http://localhost" # open browser, and you can using the Team work functions +``` + +Bump version: + +``` +# make sure all changes are commited +make images # build new image without dirty + +make bump-version # bump version if your configuration changes(the changes will build into +git commit -a -m 'feat: bump with my local config' # save your changes ``` Browse it: diff --git a/VERSION b/VERSION index 8e9376c..424f3ff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.1.0-6924530 +v0.1.0-20de6c4 diff --git a/docker-compose.yaml b/docker-compose.yaml index 2f3463d..c35f74f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,12 +2,12 @@ services: frontend: - image: excalidraw:v0.1.0-6924530 + image: excalidraw:v0.1.0-20de6c4 ports: - 80:80 storage: - image: excalidraw-storage-backend:v0.1.0-6924530 + image: excalidraw-storage-backend:v0.1.0-20de6c4 restart: always environment: # docs https://github.com/alswl/excalidraw-storage-backend#environement-variables - PORT=8081 @@ -15,6 +15,6 @@ services: - 8081:8081 room: - image: excalidraw-room:v0.1.0-6924530 + image: excalidraw-room:v0.1.0-20de6c4 ports: - 8082:80 \ No newline at end of file diff --git a/excalidraw b/excalidraw index 015bdb1..a3ff467 160000 --- a/excalidraw +++ b/excalidraw @@ -1 +1 @@ -Subproject commit 015bdb1c0a2787c6d9544b9cbd66d9c92443431b +Subproject commit a3ff46741c9ce9156739243cd0c6f2547b190dd3