add messctl to docker

This commit is contained in:
Mayel 2020-11-05 09:25:10 +01:00
parent 6c389613de
commit 8857d10e23
7 changed files with 38 additions and 23 deletions

View file

@ -6,7 +6,6 @@ docs/exdoc
.npm
.git
.gitignore
.config
Dockerfile
Makefile
README*

1
.gitignore vendored
View file

@ -10,6 +10,7 @@
/.hex/
/.mix/
/.npm/
/.config/
# Where 3rd-party dependencies like ExDoc output generated docs.
/doc/

View file

@ -1,6 +1,6 @@
FROM elixir:1.10.4-alpine
ENV HOME=/opt/app/ TERM=xterm
ENV HOME=/opt/app/ TERM=xterm USER=docker
WORKDIR $HOME
@ -21,6 +21,15 @@ RUN apk add git \
# dependencies for comeonin
RUN apk add cmake make gcc libc-dev
# dependency manager
RUN git clone https://github.com/commonspub/messctl.git priv/messctl/origin
# precompile Rust deps
RUN cd priv/messctl && cargo init && mkdir .cargo && cp origin/Cargo.* . && cargo vendor > .cargo/config
# compile messctl
RUN cd priv/messctl && cp -r origin/* . && cargo build --release && cargo install --path . --verbose
# install
RUN cp /opt/app/.cargo/bin/* /bin/
EXPOSE 4000/tcp
EXPOSE 4004/tcp

View file

@ -1,16 +1,22 @@
.PHONY: setup updates db-reset build dev
.PHONY: setup updates db-reset build dev shell
mix-%: ## Run a specific mix command in Docker Dev, eg: `make mix-deps.get` or make mix-deps.update args="pointers"
mix-%: ## Run a specific mix command, eg: `make mix-deps.get` or make mix-deps.update args="pointers"
docker-compose run web mix $* $(args)
setup: build mix-setup ## First run - prepare Docker Dev environment and dependencies
setup: build mix-setup ## First run - prepare environment and dependencies
updates: build mix-updates ## Update/prepare Docker Dev dependencies
updates: build mix-updates ## Update/prepare dependencies
db-reset: mix-ecto.reset ## Reset the DB
build: ## Build the docker image
docker-compose build
shell: ## Open a shell, in dev mode
docker-compose run --service-ports web bash
dep-%: ## Run a specific messctl command, eg: `make dep-help` or make dep-add args="pointers"
docker-compose run --service-ports web messctl $* $(args)
dev: ## Run the app with Docker
docker-compose run --service-ports web

View file

@ -1,14 +1,14 @@
activity_pub = "https://gitlab.com/CommonsPub/activitypub.git#develop"
cpub_actors = "https://github.com/commonspub/cpub_actors#main"
pointers = "https://github.com/commonspub/pointers#main"
cpub_local_auth = "https://github.com/commonspub/cpub_local_auth#main"
cpub_accounts = "https://github.com/commonspub/cpub_accounts#main"
# cpub_blocks = "https://github.com/commonspub/cpub_blocks#main"
# cpub_bookmarks = "https://github.com/commonspub/cpub_bookmarks#main"
# cpub_characters = "https://github.com/commonspub/cpub_characters#main"
cpub_emails = "https://github.com/commonspub/cpub_emails#main"
cpub_users = "https://github.com/commonspub/cpub_users#main"
cpub_profiles = "https://github.com/commonspub/cpub_profiles#main"
cpub_characters = "https://github.com/commonspub/cpub_characters#main"
# cpub_circles = "https://github.com/commonspub/cpub_circles#main"
cpub_blocks = "https://github.com/commonspub/cpub_blocks#main"
# cpub_bookmarks = "https://github.com/commonspub/cpub_bookmarks#main"
# cpub_comments = "https://github.com/commonspub/cpub_comments#main"
# cpub_communities = "https://github.com/commonspub/cpub_communities#main"
cpub_emails = "https://github.com/commonspub/cpub_emails#main"
# cpub_local_auth = "https://github.com/commonspub/cpub_local_auth#main"
# cpub_profiles = "https://github.com/commonspub/cpub_profiles#main"
# cpub_users = "https://github.com/commonspub/cpub_users#main"

View file

@ -24,13 +24,13 @@ telemetry_metrics = "~> 0.4"
telemetry_poller = "~> 0.4"
# plugins
# cpub_accounts = "~> 0.1"
cpub_blocks = "~> 0.1"
cpub_characters = "~> 0.1"
# cpub_local_auth = "~> 0.1"
# cpub_emails = "~> 0.1"
cpub_local_auth = "~> 0.1"
cpub_profiles = "~> 0.1"
cpub_users = "~> 0.1"
# cpub_users = "~> 0.1"
# cpub_profiles = "~> 0.1"
# cpub_characters = "~> 0.1"
# cpub_circles, "~> 0.1"
# cpub_comments, "~> 0.1"
# cpub_communities, "~> 0.1"
# cpub_blocks = "~> 0.1"
ok = "~> 2.3.0"

View file

@ -12,12 +12,12 @@
"cowlib": {:hex, :cowlib, "2.9.1", "61a6c7c50cf07fdd24b2f45b89500bb93b6686579b069a89f88cb211e1125c78", [:rebar3], [], "hexpm", "e4175dc240a70d996156160891e1c62238ede1729e45740bdd38064dad476170"},
"cpub_accounts": {:git, "https://github.com/commonspub/cpub_accounts", "b731e9e06d9cbf60a10e866ada870c1770a2b334", [branch: "main"]},
"cpub_actors": {:git, "https://github.com/commonspub/cpub_actors", "b3c591fa3227d70c7a159fb14d18d3295a514346", [branch: "main"]},
"cpub_blocks": {:hex, :cpub_blocks, "0.1.0", "1b9032e4f14ab36a6960fd9a7d4d9275bf146714123f5b72b8b62b454ef0f187", [:mix], [{:pointers, "~> 0.5.1", [hex: :pointers, repo: "hexpm", optional: false]}], "hexpm", "6244ccccd572482a9389613927c98ac2aa14ea13340d61c8e0731489d37fcc73"},
"cpub_characters": {:hex, :cpub_characters, "0.1.0", "e4f13e8f59e499faa3341f37696655ea9eea4f5d0856a34f457e159c5363b6b5", [:mix], [{:pointers, "~> 0.5.1", [hex: :pointers, repo: "hexpm", optional: false]}], "hexpm", "d9b4a29dfee4d520363e4a9cc7ab07253c5319ef8e362564338704cdb6c26178"},
"cpub_blocks": {:git, "https://github.com/commonspub/cpub_blocks", "db31e0a32d9a8228810e35f5d91a87129c8fe7fb", [branch: "main"]},
"cpub_characters": {:git, "https://github.com/commonspub/cpub_characters", "8a091481c23896ba4e594ba6438bd3ec6fbb8f0e", [branch: "main"]},
"cpub_emails": {:git, "https://github.com/commonspub/cpub_emails", "9ce5af3da39c8d8488d3de5fbb760e4c7706578c", [branch: "main"]},
"cpub_local_auth": {:hex, :cpub_local_auth, "0.1.0", "f5d479af1c16a99f6f7e6802fae56f56d1ec590fd502fabff649dbaecd0d5f2d", [:mix], [{:argon2_elixir, "~> 2.3.0", [hex: :argon2_elixir, repo: "hexpm", optional: false]}, {:pointers, "~> 0.5.1", [hex: :pointers, repo: "hexpm", optional: false]}], "hexpm", "f3a08714f2b285bb32a2f7775cd8458c02d0d7079c97028c931aa08827aaf996"},
"cpub_profiles": {:hex, :cpub_profiles, "0.1.0", "e5b627ee16691bb04865ae3eb97cabfdd9f28d4b9fb220438fde0ccbf05f936c", [:mix], [{:pointers, "~> 0.5.1", [hex: :pointers, repo: "hexpm", optional: false]}], "hexpm", "cf54ca9e0adecdbdf3d79f3bc90d4c3c97053f106359a5c09d857d389d27b69c"},
"cpub_users": {:hex, :cpub_users, "0.1.0", "ac95256aa4eb8032c2239fd4eb5351e28c691b477707bbf1230a86c7048f9a41", [:mix], [{:pointers, "~> 0.5.1", [hex: :pointers, repo: "hexpm", optional: false]}], "hexpm", "f31af6fbd0d802fb1670fe950b968a90589ffaaaed85fd850e72acb5ba0a9346"},
"cpub_local_auth": {:git, "https://github.com/commonspub/cpub_local_auth", "f3e4393659718044cc985b9958684cc791844d66", [branch: "main"]},
"cpub_profiles": {:git, "https://github.com/commonspub/cpub_profiles", "c0f8d35eb1a6417ed7a4a772f039655d4886d0b2", [branch: "main"]},
"cpub_users": {:git, "https://github.com/commonspub/cpub_users", "94c56849af715c314860d52a08e191f5b274045a", [branch: "main"]},
"db_connection": {:hex, :db_connection, "2.2.2", "3bbca41b199e1598245b716248964926303b5d4609ff065125ce98bcd368939e", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "642af240d8a8affb93b4ba5a6fcd2bbcbdc327e1a524b825d383711536f8070c"},
"dbg": {:hex, :dbg, "1.0.1", "9c29813e5df8b4d275325416523d511e315656b8ac27a60519791f9cf476d83d", [:mix], [], "hexpm", "866159f496a1ad9b959501f16db3d1338bb6cef029a75a67ca5615d25b38345f"},
"decimal": {:hex, :decimal, "1.9.0", "83e8daf59631d632b171faabafb4a9f4242c514b0a06ba3df493951c08f64d07", [:mix], [], "hexpm", "b1f2343568eed6928f3e751cf2dffde95bfaa19dd95d09e8a9ea92ccfd6f7d85"},