Skip to content

Merge prior to release v.1.1.0 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GufCab merged 7 commits into from
Feb 22, 2022
Merged

Merge prior to release v.1.1.0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8a1cb0
Docker container with simulator
AugustHA-Iterator Dec 20, 2021
7c642b8
Changes with docker files. Can now use docker-compose up on the simul…
AugustHA-Iterator Dec 21, 2021
f819ae9
The simulator container will now also be available inside the os2Iot …
AugustHA-Iterator Dec 22, 2021
4f53c83
Changed port number
AugustHA-Iterator Jan 4, 2022
3c99e00
pr changes
AugustHA-Iterator Jan 4, 2022
6f32962
rename folder from Simulator to simulator
AugustHA-Iterator Jan 4, 2022
fcde8f0
Merge pull request #9 from OS2iot/feature/IOT_1239_Simulator
augusthjerrild Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docker-compose.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"