Skip to content

Commit

Permalink
Merge pull request #156 in TELIMA/karnak from feat/update_cert_from_d…
Browse files Browse the repository at this point in the history
…ev to release

* commit 'cbf5acef8a540bb6beba778391712ecf584afb46': (147 commits)
  feat: change to maven 3.6
  feat: change to https repositories
  feat: change to java 17 dockerfile
  feat: change to java 17
  feat: change pom version
  feat: remove memory service
  feat: spring format
  feat: test call garbage
  feat: test call garbage
  feat: test change dicom tool version
  feat: test release planar image
  feat: test release planar image
  feat: test release planar image
  feat: change pom version
  feat: test oom
  feat: change pom version
  add instance tag form premetheus
  feat: add user and group for executing Dockerfile: rollback
  feat: add user and group for executing Dockerfile
  feat: change pom version
  ...
  • Loading branch information
jdcshug committed Aug 16, 2022
2 parents 7f09b2b + cbf5ace commit 5125433
Show file tree
Hide file tree
Showing 338 changed files with 74,893 additions and 72,413 deletions.
165 changes: 108 additions & 57 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# docker build -t osirixfoundation/karnak:latest -f Dockerfile .

# Based on build image containing maven, jdk and git
FROM maven:3.6-adoptopenjdk-15 as builder
#FROM maven:3.8-eclipse-temurin-17 as builder
FROM maven:3.6-openjdk-17 as builder
WORKDIR /app

# Build the Spring Boot application with layers
Expand All @@ -16,8 +17,9 @@ RUN cp ../target/karnak*.jar application.jar
RUN java -Djarmode=layertools -jar application.jar extract

# Build the final deployment image
FROM adoptopenjdk:15-jre-hotspot
FROM eclipse-temurin:17-jdk-jammy
WORKDIR app

COPY --from=builder /app/bin/dependencies/ ./
RUN true
COPY --from=builder /app/bin/spring-boot-loader/ ./
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@Library('hug-dsi@master') _
import ch.hcuge.dsi.jenkins.BuildImage;
newGenMavenPipeline(mavenImage: BuildImage.MVN_36_JDK15)
newGenMavenPipeline(mavenImage: BuildImage.MVN_36_JDK17)
34 changes: 20 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ output.
For more information, see the
online [Karnak user guide](https://osirix-foundation.github.io/karnak-documentation/)

:warning: **Security**: Karnak is using Logback and is not affected by CVE-2021-44228. [CVE-2021-42550 has been fixed](https://github.com/OsiriX-Foundation/karnak/issues/180) since v0.9.9
:warning: **Security**: Karnak is using Logback and is not affected by
CVE-2021-44228. [CVE-2021-42550 has been fixed](https://github.com/OsiriX-Foundation/karnak/issues/180)
since v0.9.9

# Application Features

Expand Down Expand Up @@ -53,7 +55,8 @@ see [karnak-docker](https://github.com/OsiriX-Foundation/karnak-docker).
- Enable Spring and Spring Boot for the project
- Create a Spring Boot launcher from main of StartApplication.java
- Working Directory must be the mvc directory
- In VM Options, add `-Djava.library.path="/tmp/dicom-opencv"`. Note: the tmp folder must be adapted according to your system and `dicom-opencv` is mandatory as the last folder.
- In VM Options, add `-Djava.library.path="/tmp/dicom-opencv"`. Note: the tmp folder must be
adapted according to your system and `dicom-opencv` is mandatory as the last folder.
- In Environment variables, add the following values. The following values work with our default
configuration define with docker used for the development (see: "Configure locally
Mainzelliste and Postgres database with docker-compose") :
Expand All @@ -80,7 +83,7 @@ see [karnak-docker](https://github.com/OsiriX-Foundation/karnak-docker).
- `OIDC_CLIENT_ID=undefined`
- `OIDC_CLIENT_SECRET=undefined`
- `OIDC_ISSUER_URI=undefined`

## Configure locally Mainzelliste and Postgres database with docker-compose

Minimum docker-compose version: **1.22**
Expand Down Expand Up @@ -120,32 +123,35 @@ See [all the environment variables](https://github.com/OsiriX-Foundation/karnak-

This project is divided in two parts:

- backend: spring data (entities, repositories, converters, validators), enums,
spring configurations, spring security, cache, spring services, models...
- backend: spring data (entities, repositories, converters, validators), enums,
spring configurations, spring security, cache, spring services, models...
- frontend : Vaadin components: logic services, graphic components, views

# Logs Kibana

In order to activate the logs in Kibana, activate the profile docker (from application-docker.yml)
in the pom.xml : spring.profiles.active

The logs can be seen here:
The logs can be seen here:

- https://kibana-cert/s/spring/app/kibana#/discover
- with the filter springAppName : karnak

# Identity provider

An OpenID Connect identity provider can be configured by using the environment variables:
- `IDP`: when this environment variable has the value 'oidc', the following environment
variables will configure the OpenID Connect identity provider. Any other value will load the in
memory user configuration.
- `OIDC_CLIENT_ID`: client id of the identity provider
- `OIDC_CLIENT_SECRET`: client secret of the identity provider
- `OIDC_ISSUER_URI`: issuer URI of the identity provider

# Documentation for API/Endpoints

- `IDP`: when this environment variable has the value 'oidc', the following environment
variables will configure the OpenID Connect identity provider. Any other value will load the in
memory user configuration.
- `OIDC_CLIENT_ID`: client id of the identity provider
- `OIDC_CLIENT_SECRET`: client secret of the identity provider
- `OIDC_ISSUER_URI`: issuer URI of the identity provider

# Documentation for API/Endpoints

In order to see the documentation for API/Endpoints:

- Local: http://localhost:8081/swagger-ui/index.html?url=/v3/api-docs
- Dev: https://karnak-dev.hcuge.ch/swagger-ui/index.html?url=/v3/api-docs
- Cert: https://karnak-cert.hcuge.ch/swagger-ui/index.html?url=/v3/api-docs
Expand Down
Loading

0 comments on commit 5125433

Please sign in to comment.