Skip to content
This repository has been archived by the owner on Dec 18, 2023. It is now read-only.

Commit

Permalink
Merge pull request #678 from thehyve/rc
Browse files Browse the repository at this point in the history
Release version 2.0.16.
  • Loading branch information
ewelinagr authored Jun 13, 2022
2 parents 08301c0 + 2b84d3a commit a178e15
Show file tree
Hide file tree
Showing 87 changed files with 6,603 additions and 5,543 deletions.
103 changes: 103 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "gb",
"style": "kebab-case"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "gb",
"style": "camelCase"
}
],
"@typescript-eslint/consistent-type-definitions": "error",
"@typescript-eslint/consistent-type-assertions": "off",
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/dot-notation": "off",
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/quotes": "off",
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/prefer-for-of": "off",
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"@typescript-eslint/member-delimiter-style": [
"off",
{
"multiline": {
"delimiter": "none",
"requireLast": true
},
"singleline": {
"delimiter": "semi",
"requireLast": false
}
}
],
"@typescript-eslint/semi": [
"off",
null
],
"prefer-arrow/prefer-arrow-functions": "off",
"jsdoc/no-types": "off",
"jsdoc/newline-after-description": "off",
"jsdoc/check-alignment": "off",
"brace-style": [
"error",
"1tbs"
],
"guard-for-in": "off",
"id-blacklist": "off",
"id-match": "off",
"no-redeclare": "error",
"no-underscore-dangle": "off",
"prefer-const": "off",
"quote-props": "off",
"arrow-body-style": "off",
"object-shorthand": "off",
"no-restricted-imports": "off",
"no-var": "off"
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {
}
}
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
!.vscode/extensions.json

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ gradle assemble
gradle publish
```

The latest release is [glowing-bear-2.0.15.tar](https://repo.thehyve.nl/service/local/repositories/releases/content/nl/thehyve/glowing-bear/2.0.15/glowing-bear-2.0.15.tar).
The latest release is [glowing-bear-2.0.16.tar](https://repo.thehyve.nl/service/local/repositories/releases/content/nl/thehyve/glowing-bear/2.0.16/glowing-bear-2.0.16.tar).

Published snapshot bundles are available in the `snapshots` repository
on https://repo.thehyve.nl with id `nl.thehyve:glowing-bear:0.0.1-SNAPSNOT:tar`.
Expand Down
30 changes: 19 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,20 @@
"src/styles/material-theme.scss",
"src/styles/styles.css"
],
"scripts": []
"scripts": [],
"aot": false,
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -50,7 +56,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -95,14 +102,12 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json",
"tsconfig.json"
],
"exclude": []
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
Expand All @@ -112,10 +117,13 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "css"
"style": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
}
},
"cli": {
"defaultCollection": "@angular-eslint/schematics"
}
}
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nginx:alpine

ARG GB_VERSION="2.0.15"
ARG GB_VERSION="2.0.16"
ARG GB_SRC_REPOSITORY="releases"

ENV GB_SRC_URL https://repo.thehyve.nl/service/local/artifact/maven/redirect?r=${GB_SRC_REPOSITORY}&g=nl.thehyve&a=glowing-bear&v=${GB_VERSION}&p=tar
Expand Down
12 changes: 6 additions & 6 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ Transmart Packer consists of a worker service that performs the export tasks
and a webapp services that handles export requests, task management and export file downloads.

Transmart Packer requires:
- Python 3.6 or newer
- Python 3.7 or newer
- Redis server

Installation steps for the Transmart Packer services:
Expand All @@ -431,7 +431,7 @@ Installation steps for the Transmart Packer services:
3. Install Transmart Packer:
```bash
source venv/bin/activate
pip install --no-cache-dir --upgrade "transmart-packer == 0.5.0"
pip install --no-cache-dir --upgrade "transmart-packer == 0.6.1"
```

4. Ensure that you have a valid offline token, for asynchronous data access. See [Offline token](#offline-token).
Expand Down Expand Up @@ -504,21 +504,21 @@ Glowing Bear requires:

1. Download the application and extract the contents in the `/var/www/glowingbear` directory:
```shell
GLOWING_BEAR_VERSION=2.0.15
GLOWING_BEAR_VERSION=2.0.16
curl -f -L -o "glowing-bear-${GLOWING_BEAR_VERSION}.tar" \
"https://repo.thehyve.nl/service/local/repositories/releases/content/nl/thehyve/glowing-bear/${GLOWING_BEAR_VERSION}/glowing-bear-${GLOWING_BEAR_VERSION}.tar"
sudo mkdir -p /var/www/glowingbear
sudo tar xf glowing-bear-${GLOWING_BEAR_VERSION}.tar -C /var/www/glowingbear
```

2. Override environment file `/var/www/glowingbear/glowing-bear-2.0.15/app/config/env.json` with the following:
2. Override environment file `/var/www/glowingbear/glowing-bear-2.0.16/app/config/env.json` with the following:
```json
{
"env": "default"
}
```

3. Edit configuration file `/var/www/glowingbear/glowing-bear-2.0.15/app/config/config.default.json` (overwrites the default config file in the `tar`):
3. Edit configuration file `/var/www/glowingbear/glowing-bear-2.0.16/app/config/config.default.json` (overwrites the default config file in the `tar`):
```json
{
"oidc-server-url": "CHANGE ME",
Expand Down Expand Up @@ -559,7 +559,7 @@ Glowing Bear requires:
error_log /var/log/nginx/glowingbear.example.com:443.error.log;
location / {
root /var/www/glowingbear/glowing-bear-2.0.15;
root /var/www/glowingbear/glowing-bear-2.0.16;
index index.html index.htm;
try_files $uri $uri/ /index.html =404;
}
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function (config) {
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
],
client:{
Expand Down
Loading

0 comments on commit a178e15

Please sign in to comment.