-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
LL-317 #92
Merged
LL-317 #92
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ba56a7a
Latest route changes (routes.ts)
KevinLemon112 cfa7912
export router from subscribe.ts and update routes.ts
KevinLemon112 beb7a53
router created in subscribe.ts, routes.ts changes
KevinLemon112 02256f9
Update routeURLs import statement to point to routes.ts instead of ac…
KevinLemon112 e061b1c
controllers created, routers created, device and user schema updated,…
KevinLemon112 09f5965
Merge branch 'master' into LL-317
pogi7 590fbc7
moved docker compose to root of server repo and integrate with contro…
pogi7 f4dca65
account.ts and docker-compose.yaml changes
KevinLemon112 8e34e98
accountController and accountRoutes deleted, userController and userR…
KevinLemon112 a4ad7ea
Latest changes
KevinLemon112 6af4352
fix 404 error w/ publish/:id
pogi7 9d82fbe
Latest changes
KevinLemon112 8a494c5
Latest changes
KevinLemon112 a23e4bd
subscribe.ts fixes
KevinLemon112 3260614
Latest changes
KevinLemon112 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
FROM node:latest | ||
WORKDIR /app | ||
COPY ["package.json", "package-lock.json*", "tsconfig.json*", "/app/"] | ||
COPY ["src", "/app/src"] | ||
RUN ["/bin/bash", "-c", "npm install"] | ||
EXPOSE 4000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,84 @@ | ||
|
||
version: "3.8" | ||
|
||
version: "3" | ||
services: | ||
# account: | ||
# build: "src/account/" | ||
# command: "npm run account" | ||
# ports: | ||
# - "5000:5000" | ||
# env_file: "src/account/.env" | ||
# dns: | ||
# - "8.8.8.8" | ||
models: | ||
build: "src/models/" | ||
command: "echo Models Container Working" | ||
routes: | ||
build: "src/routes/" | ||
command: "npx ts-node github.ts" | ||
activemq: | ||
image: rmohr/activemq | ||
container_name: activemq | ||
networks: | ||
- backend | ||
ports: | ||
- "8161:8161" | ||
- "1883:1883" | ||
env_file: ".env" | ||
|
||
# server: | ||
# build: "." | ||
# command: "npm run server" | ||
# ports: | ||
# - "4000:4000" | ||
# networks: | ||
# - backend | ||
# env_file: ".env" | ||
# depends_on: | ||
# - "activemq" | ||
account: | ||
container_name: "account" | ||
build: "src/account/" | ||
command: "npm run account" | ||
ports: | ||
- "5000:5000" | ||
env_file: ".env" | ||
dns: | ||
- "8.8.8.8" | ||
networks: | ||
- backend | ||
publish: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @KevinLemon112 The publish routes weren't working on port 4000, but they work now. You can test by using Postman or a local browser and going to http://localhost:4000/publish/all You should see something like this: {
"id": "all",
"message": "From Publish Service"
} |
||
container_name: "publish" | ||
build: | ||
context: 'src/notification/publish' | ||
env_file: ".env" | ||
volumes: | ||
- ./src/notification/publish:/app | ||
ports: | ||
- "4000:4000" | ||
- "8080:8080" | ||
env_file: "src/routes/.env" | ||
- 4000:4000 | ||
networks: | ||
- backend | ||
depends_on: | ||
- "models" | ||
client: | ||
build: "client/" | ||
command: "npm start" | ||
ports: | ||
- "3000:3000" | ||
env_file: "src/routes/.env" | ||
# Requires server services to run before running client servers | ||
- activemq | ||
|
||
subscribe: | ||
container_name: subscribe | ||
build: | ||
context: 'src/notification/subscribe' | ||
env_file: ".env" | ||
volumes: | ||
- ./src/notification/subscribe:/app | ||
networks: | ||
- backend | ||
depends_on: | ||
# - "account" | ||
- "routes" | ||
- activemq | ||
# models: | ||
# build: "src/models/" | ||
# command: "echo Models Container Working" | ||
# routes: | ||
# build: "src/routes/" | ||
# command: "npx ts-node github.ts" | ||
# ports: | ||
# - "4000:4000" | ||
# - "8080:8080" | ||
# env_file: "src/routes/.env" | ||
# depends_on: | ||
# - "models" | ||
# client: | ||
# build: "client/" | ||
# command: "npm start" | ||
# ports: | ||
# - "3000:3000" | ||
# env_file: "src/routes/.env" | ||
# # Requires server services to run before running client servers | ||
# depends_on: | ||
# # - "account" | ||
# - "routes" | ||
|
||
networks: | ||
backend: |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@KevinLemon112 There was a 404 error in all of the user routes because they were not run on the docker compose server. You will need to either uncomment this service or make a new user service to get the user routes to work.