Skip to content
Snippets Groups Projects
Commit a3c3cb0e authored by Lucendio's avatar Lucendio
Browse files

Update dependencies

* update server and client package dependencies due to CVE notifications
* update runtime dependencies
* add some information to various readmes (e.g. about the client being part of the bundle)
parent e8e0518a
No related branches found
No related tags found
No related merge requests found
......@@ -14,6 +14,10 @@ LOG_DIR = $(LOCAL_DIR)/logs
APP_NODE_MODULE_DIRS = $(foreach dir, client server, $(subst %,$(dir),$(MKFILE_DIR)/app/%/node_modules))
# NOTE: make sure to use binaries installed via ./hack/Makefile if exist
export PATH := $(LOCAL_DIR)/bin:$(PATH)
default: all
......@@ -119,12 +123,11 @@ run: | $(DATA_DIR)/ $(LOG_DIR)/
.PHONY: deps
deps:
cd $(MKFILE_DIR)/hack \
&& \
NODEJS_VERSION=12.16.3 \
NPM_VERSION=6.14.4 \
MONGODB_VERSION=4.2.6 \
make install
NODEJS_VERSION=12.21.0 \
NPM_VERSION=6.14.11 \
MONGODB_VERSION=4.2.12 \
make -C $(MKFILE_DIR)/hack \
install
@echo ''
@echo 'In order to use the installed dependencies, the $$PATH variable must be adjusted.'
@echo 'Run:'
......
......@@ -15,8 +15,8 @@ application and mess around with the source code in order to better understand h
apart if necessary.
Additionally, it documents various invocations that may help you adapting this application as *workload* for the exercise.
**_Please note, that this `Makefile` is only meant to showcase typical steps that need to be taken in order to automate
the deployment lifecycle of such an application and code base.
**_Please note, that the `Makefile` is only meant to showcase steps that are usually needed to be taken in order to
automate the deployment lifecycle of such an application and code base.
It is NOT recommended to invoke `make` targets from the CI/CD, but rather to utilize platform-specific interfaces
(e.g. `Jenkinsfile`, `.travis.yml`, etc.), which may then invoke commands shown in the `make` target or in the `scripts`
section of one of the `package.json` files._**
......@@ -30,7 +30,7 @@ The following software must be installed and available in your `${PATH}`:
* `npm` ([npm](https://www.npmjs.com/get-npm))
* `mongod` ([MongoDB](https://docs.mongodb.com/manual/installation/))
*NOTE: [required versions](https://github.com/lucendio/lecture-devops-app/blob/master/Makefile#L14-L126)*
*NOTE: [required versions](https://github.com/lucendio/lecture-devops-app/blob/master/hack/Makefile#L18-L20)*
#### Option 1
......
......@@ -11,7 +11,8 @@ The application consists of two parts:
* backend (`./server`)
During the build process, the client code is moved into the `./public` directory within the server source code.
Aside from providing an HTTP API, the backend also functions as a static file server for the client.
Aside from providing an HTTP API, the backend also functions as a static file server for the client. As a result,
backend and frontend are both bundled into a single artifact (see `make build` as an example).
The following technologies have been utilized (aka. MERN-stack):
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
"version": "2.0.0",
"private": true,
"dependencies": {
"axios": "^0.19.2",
"axios": ">=0.21.1",
"mdbreact": "^4.25.5",
"react": "^16.13.0",
"react-dom": "^16.13.0",
......
This diff is collapsed.
......@@ -11,8 +11,8 @@
},
"devDependencies": {
"env-cmd": "^10.1.0",
"jest": "^26.4.2",
"nodemon": "^2.0.4"
"jest": "^26.6.3",
"nodemon": "^2.0.7"
},
"dependencies": {
"bcryptjs": "^2.4.3",
......@@ -21,7 +21,7 @@
"express": "^4.17.1",
"helmet": "^3.22.0",
"jsonwebtoken": "^8.5.1",
"mongoose": "^5.10.7",
"mongoose": "^5.11.20",
"validator": "^13.0.0"
},
"engines": {
......
......@@ -15,9 +15,9 @@ TEMP_DIR = $(LOCAL_DIR)/tmp
# next LTS: 14.13.0
NODEJS_VERSION ?= 12.16.3
NPM_VERSION ?= 6.14.4
MONGODB_VERSION ?= 4.2.6
NODEJS_VERSION ?= 12.21.0
NPM_VERSION ?= 6.14.11
MONGODB_VERSION ?= 4.2.12
REACT_APP_VERSION = 3.4.1
......
7c763aea275b9b3ebb6b746e9e356d81305dcd0c760319bfa78abd1b30eb4612 mongodb-linux-x86_64-4.2.6.tgz
701fda6ab0b49121913204596d527d89d4a533a3a7d1ca2f245c7908e1342c5b mongodb-darwin-x86_64-4.2.6.tgz
36e7355b133a15c12e2fb5e8fefef354a99ffa048906cd855d639064f0f795b6 mongodb-linux-x86_64-4.2.12.tgz
06adf7b23ad3a3d97ae688d9001221c6cb263392ef74f3e265129b9b77b0a2e2 mongodb-darwin-x86_64-4.2.12.tgz
66518c31ea7735ae5a0bb8ea27edfee846702dbdc708fea6ad4a308d43ef5652 node-v12.16.3-linux-x64.tar.gz
0718812b3ab8e77e8d1354f4d10428ae99d78f721bdcceee527c4b592ea7fed0 node-v12.16.3-darwin-x64.tar.gz
ab121de3c472d76ec425480b0594e43109ee607bd57c3d5314bdb65fa816bf1c node-v12.21.0-linux-x64.tar.gz
4d0b5d07d41a16909fdeb41c3158c27bcdccf16231cccf76d5eb6835e2076e90 node-v12.21.0-darwin-x64.tar.gz
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment