Merge branch 'release/v0.14.2-fork'
This commit is contained in:
commit
33314581b8
13
Makefile
13
Makefile
@ -90,14 +90,17 @@ ensure-git-clean: ## Ensure git is clean
|
|||||||
exit 1; \
|
exit 1; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.PHONY: bump-version
|
.PHONY: update-docker-compose-version
|
||||||
previousVersion=$(shell head -n 1 ./VERSION)
|
update-docker-compose-version: ## Update images version for docker-compose
|
||||||
bump-version: ensure-git-clean ## Bump images version for docker-compose
|
|
||||||
@for target in $(TARGETS); do \
|
@for target in $(TARGETS); do \
|
||||||
for registry in $(REGISTRIES); do \
|
for registry in $(REGISTRIES); do \
|
||||||
image=$${registry}$(IMAGE_PREFIX)$${target}$(IMAGE_SUFFIX):$(VERSION); \
|
image=$${registry}$(IMAGE_PREFIX)$${target}$(IMAGE_SUFFIX); \
|
||||||
$(SED) -i "s#$(image):$(previousVersion)#$(image):$(VERSION)#g" docker-compose.yaml; \
|
$(SED) -i -E "s#image: $${image}:[^ ]+#image: $${image}:$(VERSION)#g" docker-compose.yaml; \
|
||||||
done; \
|
done; \
|
||||||
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 $(VERSION) > ./VERSION
|
||||||
@echo "PLEASE using 'git commit -a' to commit image version changes"
|
@echo "PLEASE using 'git commit -a' to commit image version changes"
|
||||||
|
21
README.md
21
README.md
@ -28,10 +28,23 @@ git clone --recursive git@github.com:alswl/excalidraw-collaboration.git
|
|||||||
cd excalidraw-collaboration
|
cd excalidraw-collaboration
|
||||||
git config submodule.excalidraw.ignore all # ignore submodule changes, we will patch them
|
git config submodule.excalidraw.ignore all # ignore submodule changes, we will patch them
|
||||||
|
|
||||||
make patch images
|
# $EDITOR excalidraw.env.production # (optional) edit service endpoint
|
||||||
git commit -a -m 'feat: new image'
|
|
||||||
make bump-version
|
make patch images # patch to configurations and build the container image
|
||||||
docker-compose up
|
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:
|
Browse it:
|
||||||
|
@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
frontend:
|
frontend:
|
||||||
image: excalidraw:v0.1.0-6924530
|
image: excalidraw:v0.1.0-20de6c4
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 80:80
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
image: excalidraw-storage-backend:v0.1.0-6924530
|
image: excalidraw-storage-backend:v0.1.0-20de6c4
|
||||||
restart: always
|
restart: always
|
||||||
environment: # docs https://github.com/alswl/excalidraw-storage-backend#environement-variables
|
environment: # docs https://github.com/alswl/excalidraw-storage-backend#environement-variables
|
||||||
- PORT=8081
|
- PORT=8081
|
||||||
@ -15,6 +15,6 @@ services:
|
|||||||
- 8081:8081
|
- 8081:8081
|
||||||
|
|
||||||
room:
|
room:
|
||||||
image: excalidraw-room:v0.1.0-6924530
|
image: excalidraw-room:v0.1.0-20de6c4
|
||||||
ports:
|
ports:
|
||||||
- 8082:80
|
- 8082:80
|
@ -1 +1 @@
|
|||||||
Subproject commit 015bdb1c0a2787c6d9544b9cbd66d9c92443431b
|
Subproject commit a3ff46741c9ce9156739243cd0c6f2547b190dd3
|
Loading…
Reference in New Issue
Block a user