mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-15 23:52:41 +00:00
Code Issues Projects Releases Wiki Activity

revert messctl

Browse source
This commit is contained in:
Mayel 2020-11-10 09:21:44 +01:00
parent cd5bb77927
commit feb7cb86af
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.dockerignore
View file

@ -15,4 +15,5 @@ priv/static
assets/node_modules
data/search
data/postgres
libs/*/data/postgres
libs/*/data/postgres
forks/*/data/postgres

3
.gitignore vendored
View file

@ -41,4 +41,5 @@ npm-debug.log
# user-local overrides for mess
deps.path
/libs/
/libs/
/forks/

8
Dockerfile.dev
View file

@ -1,6 +1,6 @@
FROM elixir:1.10.4-alpine
ENV HOME=/opt/app/ TERM=xterm USER=docker
ENV HOME=/opt/app/ TERM=xterm USER=docker FORKS=./forks
WORKDIR $HOME
@ -22,11 +22,11 @@ RUN apk add git \
RUN apk add cmake make gcc libc-dev
# dependency manager
RUN (git clone https://github.com/commonspub/messctl.git libs/messctl/origin 2> /dev/null || (cd libs/messctl/origin && git pull)) && cd libs/messctl/origin && git checkout 8421d5e
RUN (git clone https://github.com/commonspub/messctl.git $FORKS/messctl/origin 2> /dev/null || (cd $FORKS/messctl/origin && git pull)) && cd $FORKS/messctl/origin && git checkout 8f53c86687ba2bd262471c6e8d9490ed00bf1306
# precompile Rust deps
RUN cd libs/messctl && cargo init && mkdir .cargo && cp origin/Cargo.* . && cargo build
RUN cd $FORKS/messctl && cargo init && mkdir .cargo && cp origin/Cargo.* . && cargo build
# compile messctl
RUN cd libs/messctl && cp -r origin/* . && cargo build --release && cargo install --path . --verbose
RUN cd $FORKS/messctl && cp -r origin/* . && cargo build --release && cargo install --path . --verbose
# install
RUN cp /opt/app/.cargo/bin/* /bin/

6
Makefile
View file

@ -1,6 +1,6 @@
.PHONY: setup updates db-reset build dev shell
LIBS_PATH=./libs/
LIBS_PATH=./forks/
mix-%: ## Run a specific mix command, eg: `make mix-deps.get` or make mix-deps.update args="pointers"
docker-compose run web mix $* $(args)
@ -30,8 +30,8 @@ dep-clone-local: ## Clone a git dep and use the local version, eg: make dep-clon
git clone $(repo) $(LIBS_PATH)$(dep) 2> /dev/null || (cd $(LIBS_PATH)$(dep) ; git pull)
make dep-go-local dep=$(dep)
dep-go-local: ## Switch to using a standard local path, eg: make dep-go-local dep=pointers
make dep-go-local-path dep=$(dep) path=$(LIBS_PATH)$(dep)
dep-go-local-%: ## Switch to using a standard local path, eg: make dep-go-local dep=pointers
make dep-go-local-path dep=$*$(dep) path=$(LIBS_PATH)$(dep)
dep-go-local-path: ## Switch to using a local path, eg: make dep-go-local dep=pointers path=./libs/pointers
make dep-local-add dep=$(dep) path=$(path)