Fixed merge

harkiratsm · Nov 2, 2021 · 43c1468 · 43c1468
2 parents 85f723a + 0bf38b0
commit 43c1468
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -17,15 +17,6 @@
 </p>
 
 ---
-
-## Architecture 
-
-High-level overview
-
-![Repo Banner](https://raw.githubusercontent.com/fonoster/fonoster/dev/docs/assets/images/arquitecture.png)
-
-> Conceptual architecture and stack. We will post more details soon.
-
 ## Features
 
 The most notable features on FN 0.1 are:

diff --git a/docs/operator/deploy-with-docker.md b/docs/operator/deploy-with-docker.md
@@ -1,16 +1,16 @@
 # Deploy with Docker
 
-The easiest way to start running your Fonos server is with our docker-in-docker (dind) installer. Before running the installation command, make sure you have [Docker Engine](https://docs.docker.com/engine/install/) installed on your machine:
+The easiest way to start running your Fonoster server is with our docker-in-docker (dind) installer. Before running the installation command, make sure you have [Docker Engine](https://docs.docker.com/engine/install/) installed on your machine:
 
 ## Unix
 
 ```bash
 docker run -it --rm \
-  -e CONFIG_PATH=$(pwd)/fonos/config \
+  -e CONFIG_PATH=$(pwd)/fonoster/config \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  --volume $(pwd)/fonos:/out:rw \
+  --volume $(pwd)/fonoster:/out:rw \
   --entrypoint="/install.sh" \
-  fonoster/fonos:0.1.27
+  fonoster/fonoster:0.2.14
 ```
 
 ## Windows
@@ -19,22 +19,22 @@ docker run -it --rm \
 
 ```cmd
 docker run -it --rm ^
-  -e CONFIG_PATH="%cd%"/fonos/config ^
+  -e CONFIG_PATH="%cd%"/fonoster/config ^
   --volume //var/run/docker.sock:/var/run/docker.sock ^
-  --volume "%cd%"/fonos:/out:rw ^
+  --volume "%cd%"/fonoster:/out:rw ^
   --entrypoint="/install.sh" ^
-  fonoster/fonos:0.1.27
+  fonoster/fonoster:0.2.14
 ```
 
 **PowerShell**
 
 ```powershell
 docker run -it --rm ,
-  -e CONFIG_PATH=${pwd}/fonos/config ,
+  -e CONFIG_PATH=${pwd}/fonoster/config ,
   --volume /var/run/docker.sock:/var/run/docker.sock ,
-  --volume ${pwd}/fonos:/out:rw ,
+  --volume ${pwd}/fonoster:/out:rw ,
   --entrypoint="/install.sh" ,
-  fonoster/fonos:0.1.27
+  fonoster/fonoster:0.2.14
 ```
 
 ## Environment Variables

diff --git a/operator/compose/env_example b/operator/compose/env_example
@@ -123,7 +123,7 @@ DS_PORT=6379
 #
 # Integration with SIPProxy (Routr)
 #
-SIPPROXY_IMAGE=fonoster/routr:1.0.0-edge-20210626.2
+SIPPROXY_IMAGE=fonoster/routr:1.0.0-rc6
 SIPPROXY_USERNAME=ast
 SIPPROXY_API_HOST=sipproxy.fonoster
 SIPPROXY_HOST=sipproxy.fonoster

diff --git a/operator/compose/init.yml b/operator/compose/init.yml
@@ -37,7 +37,7 @@ services:
       fonoster:
 
   service_creds:
-    image: fonoster/jwthelper
+    image: fonoster/jwthelper:${COMPOSE_PROJECT_VERSION}
     environment:
       ENDPOINT: ${AS_HOST}:${HTTP_PORT}
       ACCESS_KEY_ID: internal
@@ -53,9 +53,9 @@ services:
         target: /home/fonoster/config
 
   user_creds:
-    image: fonoster/jwthelper
+    image: fonoster/jwthelper:${COMPOSE_PROJECT_VERSION}
     environment:
-      ACCESS_KEY_ID: fonos
+      ACCESS_KEY_ID: fonoster
       ROLE: USER
       EXPIRATION: 1y
     volumes: