char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix order of docker command arguments and change repository link to...

Browse source 
...github.com repo, to relieve some pressure from git.koesters.xyz.
This commit is contained in:
Daniel Wiesenberg 2020-10-18 23:06:08 +02:00
parent cde4178f4a
commit 2d6b7750fd
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -11,7 +11,7 @@ FROM alpine:3.12 as builder
# from the official git repository. Defaults to the git repo. # from the official git repository. Defaults to the git repo.
ARG LOCAL=false ARG LOCAL=false
# Specifies which revision/commit is build. Defaults to HEAD # Specifies which revision/commit is build. Defaults to HEAD
ARG GIT_REF=HEAD ARG GIT_REF=origin/master
# Add 'edge'-repository to get Rust 1.45 # Add 'edge'-repository to get Rust 1.45
RUN sed -i \ RUN sed -i \
@ -30,7 +30,7 @@ COPY . .
RUN if [[ $LOCAL == "true" ]]; then \ RUN if [[ $LOCAL == "true" ]]; then \
cargo install --path . ; \ cargo install --path . ; \
else \ else \
cargo install --git "https://git.koesters.xyz/timo/conduit.git" --rev ${GIT_REF}; \ cargo install --git "https://github.com/timokoesters/conduit.git" --rev ${GIT_REF}; \
fi fi
########################## RUNTIME IMAGE ########################## ########################## RUNTIME IMAGE ##########################

2
README.md
View file

@ -29,7 +29,7 @@ Pull and run the docker image with
``` bash ``` bash
docker pull matrixconduit/matrix-conduit:latest docker pull matrixconduit/matrix-conduit:latest
docker run -d matrixconduit/matrix-conduit:latest -p 8448:8000 -v db:/srv/conduit/.local/share/conduit docker run -d -p 8448:8000 -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest
``` ```
Or build and run it with docker or docker-compose. [Read more](docker/README.md) Or build and run it with docker or docker-compose. [Read more](docker/README.md)

2
docker/README.md
View file

@ -40,7 +40,7 @@ which also will tag the resulting image as `matrixconduit/matrix-conduit:latest`
After building the image you can simply run it with After building the image you can simply run it with
``` bash ``` bash
docker run -d matrixconduit/matrix-conduit:latest -p 8448:8000 -v db:/srv/conduit/.local/share/conduit -e ROCKET_SERVER_NAME="localhost:8000" docker run -d -p 8448:8000 -v db:/srv/conduit/.local/share/conduit -e ROCKET_SERVER_NAME="localhost:8000" matrixconduit/matrix-conduit:latest
``` ```
For detached mode, you also need to use the `-d` flag. You can pass in more env vars as are shown here, for an overview of possible values, you can take a look at the `docker-compose.yml` file. For detached mode, you also need to use the `-d` flag. You can pass in more env vars as are shown here, for an overview of possible values, you can take a look at the `docker-compose.yml` file.