Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
cd ui
npm test
- name: Code Coverage
if: github.event_name == 'pull_request'
uses: romeovs/lcov-reporter-action@v0.2.16
with:
lcov-file: ./server/coverage/lcov.info
Expand Down
4 changes: 4 additions & 0 deletions docker/buildDockerImages.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cd ../ui/
docker build -t highway-ui .
cd ../server/
docker build -t highway-server .
2 changes: 2 additions & 0 deletions docker/buildServer.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cd ../server/
docker build -t highway-server .
2 changes: 2 additions & 0 deletions docker/buildUI.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cd ../ui/
docker build -t highway-ui .
56 changes: 56 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: "2"
services:
web:
image: "highway-ui"
ports:
- "8080:8080"
networks:
- frontend
depends_on:
- server
links:
- server
server:
image: "highway-server"
ports:
- "3000:3000"
depends_on:
- mongo
links:
- mongo
networks:
- backend
- frontend
mongo:
image: "mongo"
ports:
- "27017:27017"
networks:
- backend

networks:
frontend:
backend:


# DB

# Run
# docker run -v mongodata:/data/db -d -p 27017:27017 --name highway-db highway-db

# UI

# Run
# docker run -d -p 8080:8080 --rm --name highway-ui- highway-ui

# Build
# docker build -t highway-ui .


# Server

# Run
# docker run -d -p 3000:3000 --rm --name highway-server highway-server

# Build
# docker build -t highway-server .
2 changes: 1 addition & 1 deletion server/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
TOKEN_SECRET=test
TOKEN_SECRET=TEST_TOKEN
8 changes: 8 additions & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# syntax=docker/dockerfile:1
FROM node:16-alpine
RUN apk add --no-cache python2 g++ make
WORKDIR /server
COPY . .
RUN npm install
ENV NODE_ENV production
CMD ["node", "bin/www"]
3 changes: 3 additions & 0 deletions server/config/db.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ module.exports = {
test: {
url: "mongodb://localhost:27017/highwaytrackerdb_testing",
},
production: {
url: "mongodb://mongo:27017/highwaytrackerdb",
},
};
1 change: 0 additions & 1 deletion server/database/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ db.mongoose.plugin((schema) => {
function setRunValidators() {
this.setOptions({ runValidators: true });
}

// Using the mongoose object, start the database
db.mongoose
.connect(db.url, {
Expand Down
1 change: 1 addition & 0 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"eslint": "^8.8.0",
"express": "^4.17.2",
"haversine": "^1.1.1",
"haversine-distance": "^1.2.1",
"http-errors": "^2.0.0",
"jshint": "^2.13.4",
"jsonwebtoken": "^8.5.1",
Expand Down
9 changes: 9 additions & 0 deletions ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM node:16-alpine
RUN npm install -g http-server
WORKDIR /ui
COPY package*.json ./
RUN npm install
COPY . .
RUN npm run build
EXPOSE 8080
CMD ["npm", "run", "serve"]
5 changes: 5 additions & 0 deletions ui/vue.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
devServer: {
host: "0.0.0.0",
},
};