Skip to content

Commit db6d277

Browse files
authored
Fix: Update docker environment (#294)
* docs: Update CHANGELOG * chore: Update docker process * chore: Update ui-lib
1 parent 5409d9b commit db6d277

5 files changed

Lines changed: 19 additions & 12 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## v3.0.0 (Next Release)
44

5-
### Breaking changes
5+
## Breaking changes
66

77
- #283 Upgrade to Angular 9
88

9-
### Enhancements
9+
## Enhancements
1010

1111
- #286 Get dsp-api version from the api server info
1212
- #285 Integrate OntoVis
@@ -16,17 +16,23 @@
1616
- #256 Add new unit tests to components in the main folder
1717
- #255 Fix wording through Knora-app
1818

19-
### Styling
19+
## Styling
2020

2121
- #275 Refactor material icons
2222
- #260 Same content style in each project tab
2323

24-
### Dependencies
24+
## Documentation
25+
26+
- #292 docs: Update README
2527

28+
## Dependencies
29+
30+
- #293 Update js- and ui-lib version
2631
- #283 Upgrade to Angular 9
2732

28-
### Maintenance
33+
## Maintenance
2934

35+
- #291 DSP-617 Update release process
3036
- #290 DSP-617 Use release-drafter instead gren
3137
- #288 DSP-420 update release process
3238
- #287 Replace the term source by resource
@@ -35,9 +41,10 @@
3541
- #275 Refactor material icons
3642
- #259 Delete dev folder
3743

38-
### Testing
44+
## Testing
3945

4046
- #281 Update CI test environment
47+
- #256 Add new unit tests to components in the main folder
4148
- #254 Add todo list in spec files
4249

4350
---

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### STAGE 1: Build ###
22

33
# We label our stage as 'builder'
4-
FROM node:11-stretch as builder
4+
FROM node:12-stretch as builder
55

66
LABEL maintainer="ivan.subotic@unibas.ch"
77

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CURRENT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
77
include vars.mk
88

99
.PHONY: build-dsp-app-image
10-
build-dsp-app-image: ## build and publish DSP APP image locally
10+
build-dsp-app-image: ## build DSP APP image locally
1111
docker build -t $(DSP_APP_IMAGE) .
1212
docker tag $(DSP_APP_IMAGE) $(DSP_APP_REPO):latest
1313

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@angular/platform-browser-dynamic": "~9.1.12",
3232
"@angular/router": "~9.1.12",
3333
"@dasch-swiss/dsp-js": "1.0.0-rc.11",
34-
"@dasch-swiss/dsp-ui": "1.0.0-rc.6",
34+
"@dasch-swiss/dsp-ui": "1.0.0-rc.7",
3535
"@ngx-translate/core": "^13.0.0",
3636
"@ngx-translate/http-loader": "^6.0.0",
3737
"3d-force-graph": "^1.60.12",

0 commit comments

Comments
 (0)