Skip to content
Permalink
Browse files
Fix: Update docker environment (#294)
* docs: Update CHANGELOG

* chore: Update docker process

* chore: Update ui-lib
  • Loading branch information
kilchenmann committed Sep 15, 2020
1 parent 5409d9b commit db6d277cdf5bbb5372a63e64eeb7b53684338eff
Showing with 19 additions and 12 deletions.
  1. +13 −6 CHANGELOG.md
  2. +1 −1 Dockerfile
  3. +1 −1 Makefile
  4. +3 −3 package-lock.json
  5. +1 −1 package.json
@@ -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
@@ -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
@@ -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

---
@@ -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"

@@ -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

Some generated files are not rendered by default. Learn more.

@@ -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",

0 comments on commit db6d277

Please sign in to comment.