From 2d6b7750fd98fef867e84097445f74496d1b3b3f Mon Sep 17 00:00:00 2001 From: Daniel Wiesenberg Date: Sun, 18 Oct 2020 23:06:08 +0200 Subject: [PATCH] Fix order of docker command arguments and change repository link to... ...github.com repo, to relieve some pressure from git.koesters.xyz. --- Dockerfile | 4 ++-- README.md | 2 +- docker/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ed7371f..a97f4cf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ FROM alpine:3.12 as builder # from the official git repository. Defaults to the git repo. ARG LOCAL=false # 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 RUN sed -i \ @@ -30,7 +30,7 @@ COPY . . RUN if [[ $LOCAL == "true" ]]; then \ cargo install --path . ; \ 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 ########################## RUNTIME IMAGE ########################## diff --git a/README.md b/README.md index 6c9fa744..c8397758 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Pull and run the docker image with ``` bash 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) diff --git a/docker/README.md b/docker/README.md index c569c5f6..f90b9a41 100644 --- a/docker/README.md +++ b/docker/README.md @@ -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 ``` 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.