Skip to content

Commit

Permalink
Merge prior to release v.1.1.0 (#10)
Browse files Browse the repository at this point in the history
* Docker container with simulator

* Changes with docker files. Can now use docker-compose up on the simulator itself so the other containers will not be included.

* The simulator container will now also be available inside the os2Iot container. Still available from the simulator as well. Since they both have to use port 8000, they can't be used in the same time.

* Changed port number

* rename folder from Simulator to simulator

Co-authored-by: August Andersen <[email protected]>
Co-authored-by: augusthjerrild <[email protected]>
  • Loading branch information
3 people authored Feb 22, 2022
1 parent 986a77a commit bb00ae8
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
9 changes: 9 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ services:
BASE_URL: http://localhost:3000/api/v1/
TABLE_PAGE_SIZE: 20

#OS2IoT
os2iot-lorawanSimulator:
image: "os2iot-lorawan_simulator"
build:
context: "./simulator"
dockerfile: "Dockerfile"
ports:
- "8768:8000"

os2iot-backend:
image: "os2iot-backend"
build:
Expand Down
19 changes: 19 additions & 0 deletions simulator/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM ubuntu

RUN apt-get update && apt-get install make

RUN apt-get update && apt-get install git -y

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install golang -y

RUN apt-get install ca-certificates -y

RUN git clone https://github.com/UniCT-ARSLab/LWN-Simulator.git

WORKDIR /LWN-Simulator

RUN make install-dep

CMD make run
8 changes: 8 additions & 0 deletions simulator/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
services:
os2iot-lorawanSimulator:
image: "os2iot-lorawan_simulator"
build:
context: "./"
dockerfile: "Dockerfile"
ports:
- "8768:8000"

0 comments on commit bb00ae8

Please sign in to comment.