Skip to content
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

Jump to bottom

Fix: Update docker environment #294

Merged
merged 3 commits into from Sep 15, 2020
Merged

Fix: Update docker environment #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
123c97e
docs: Update CHANGELOG
kilchenmann Sep 15, 2020
ac29a42
chore: Update docker process
kilchenmann Sep 15, 2020
89ad28d
chore: Update ui-lib
kilchenmann Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 13 additions & 6 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -2,11 +2,11 @@

## v3.0.0 (Next Release)

### Breaking changes
## Breaking changes

- #283 Upgrade to Angular 9

### Enhancements
## Enhancements

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

### Styling
## Styling

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

### Dependencies
## Documentation

- #292 docs: Update README

## Dependencies

- #293 Update js- and ui-lib version
- #283 Upgrade to Angular 9

### Maintenance
## Maintenance

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

### Testing
## Testing

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

---
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
@@ -1,7 +1,7 @@
### STAGE 1: Build ###

# We label our stage as 'builder'
FROM node:11-stretch as builder
FROM node:12-stretch as builder

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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ CURRENT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
include vars.mk

.PHONY: build-dsp-app-image
build-dsp-app-image: ## build and publish DSP APP image locally
build-dsp-app-image: ## build DSP APP image locally
docker build -t $(DSP_APP_IMAGE) .
docker tag $(DSP_APP_IMAGE) $(DSP_APP_REPO):latest

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
"@angular/platform-browser-dynamic": "~9.1.12",
"@angular/router": "~9.1.12",
"@dasch-swiss/dsp-js": "1.0.0-rc.11",
"@dasch-swiss/dsp-ui": "1.0.0-rc.6",
"@dasch-swiss/dsp-ui": "1.0.0-rc.7",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"3d-force-graph": "^1.60.12",
Expand Down