Skip to content

Commit

Permalink
Merge pull request #85 from medizininformatik-initiative/release/v1.0…
Browse files Browse the repository at this point in the history
….0-alpha.1

Release/v1.0.0 alpha.1
  • Loading branch information
juliangruendner authored Oct 20, 2024
2 parents 5748e9a + d768a89 commit f60f8e5
Show file tree
Hide file tree
Showing 152 changed files with 32,987 additions and 4,128 deletions.
24 changes: 19 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,21 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: maven-${{ hashFiles('pom.xml') }}
key: tests-maven-${{ hashFiles('pom.xml') }}

- uses: s4u/maven-settings-action@v3.0.0
with:
servers: |
[{"id": "mii", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}]
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: java
queries: security-and-quality

- name: Build
run: mvn -B verify
- name: Download Ontology and Build
run: mvn -Pdownload-ontology -B verify

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
Expand Down Expand Up @@ -94,9 +99,10 @@ jobs:
output: trivy-results.sarif
severity: 'CRITICAL,HIGH'
timeout: '15m0s'
skip-files: 'app/ontology/*'
env:
# https://aquasecurity.github.io/trivy/v0.55/docs/references/troubleshooting/#github-rate-limiting
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db:1

- name: Upload Trivy Scan Results to GitHub Security Tab
uses: github/codeql-action/upload-sarif@v3
Expand Down Expand Up @@ -138,6 +144,14 @@ jobs:
- name: Load torch Image
run: docker load --input /tmp/torch.tar

- uses: s4u/maven-settings-action@v3.0.0
with:
servers: |
[{"id": "mii", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}]
- name: Download Ontology
run: mvn -Pdownload-ontology -B -DskipTests package

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
log/
target/
output
ontology
dependencies
package.json
fhirpkg.lock.json
Expand Down
38 changes: 23 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [UNRELEASED] - yyyy-mm-dd

### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security

## [v1.0.0-alpha.1] - 2024-10-21

### Added
- **Open Id Connect Authenticatoon**
- **Filter Resources by Consent selected in CCDL**
- **Expand concept code filter**
- **CQL cohort execution**
- **Ontology integration**


## [v1.0.0-alpha] - 2024-09-19

### Added
Expand All @@ -11,19 +34,4 @@
- **Multi FHIR Profile Handling**: Added the ability to handle multiple FHIR profiles per resource, selecting the first known profile greedily.
- **Resource Redaction and Copying**: Introduced basic functionality for redacting and copying patient resources.

### Changed
-None.


### Deprecated
- None.

### Removed
- None.

### Fixed
- None.

### Security
- None.

16 changes: 16 additions & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Development

## Release Checklist

* create a release branch called `release/v<version>` like `release/v1.1.0`
* rename every occurrence of the old version, say `1.0.0` or `1.1.0-SNAPSHOT` into the new version, say `1.1.0`
* update the CHANGELOG based on the milestone
* create a commit with the title `Release v<version>`
* create a PR from the release branch into the main branch
* merge that PR (after proper review)
* create and push a tag called `v<version>` like `v1.1.0` on the main branch at the merge commit
* create a new branch called `new-dev` on top of the release branch
* change the version in the POM to the next SNAPSHOT version which usually increments the minor version, e.g. `1.2.0-SNAPSHOT`
* merge the `new-dev` branch back into develop
* create release notes on GitHub
* delete the release-branch and the new-dev branch after they have been successfully merged
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ ENV TRUSTSTORE_PATH=/app/truststore
ENV TRUSTSTORE_FILE=self-signed-truststore.jks

COPY target/torch.jar /app/
COPY structureDefinitions app/structureDefinitions
COPY structureDefinitions /app/structureDefinitions
COPY mappings /app/mappings
COPY ontology /app/ontology

RUN mkdir -p $CERTIFICATE_PATH $TRUSTSTORE_PATH
RUN mkdir /app/output
RUN chown -R 1001:1001 /app

RUN chown -R 1001:1001 /app

COPY docker-entrypoint.sh /
RUN chmod +x /docker-entrypoint.sh


WORKDIR /app
USER 1001

Expand Down
Binary file modified README.md
Binary file not shown.
12 changes: 9 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
ports:
- "8082:8080"
volumes:
- "data-store-data:/app/output"
- "data-store-data:/app/data"
torch-flare:
image: ghcr.io/medizininformatik-initiative/flare:2.4.0-alpha.1
ports:
Expand All @@ -30,7 +30,7 @@ services:
restart: unless-stopped
image: nginxinc/nginx-unprivileged:1.25.5-alpine
ports:
- ${PORT_TORCH_NGINX:-127.0.0.1:8080}:8080
- ${PORT_TORCH_NGINX:-127.0.0.1:80}:8080
volumes:
- ./nginx.conf.template:/etc/nginx/nginx.conf.template
- ./start-nginx.sh:/start-nginx.sh
Expand All @@ -46,7 +46,9 @@ services:
- ${PORT_TORCH:-127.0.0.1:8086}:8080
environment:
SERVER_PORT: 8080
TORCH_PROFILE_DIR: /app/StructureDefinitions
TORCH_PROFILE_DIR: /app/structureDefinitions
TORCH_MAPPING_CONSENT: /app/mappings/consent-mappings_fhir.json
TORCH_MAPPING_CONSENT_TO_PROFILE: /app/mappings/profile_to_consent.json
TORCH_FHIR_URL: http://torch-data-store:8080/fhir
TORCH_FLARE_URL: http://torch-flare:8080
TORCH_RESULTS_DIR: /app/output
Expand All @@ -56,6 +58,10 @@ services:
NGINX_FILELOCATION: http://localhost:80
TORCH_BATCHSIZE: 100
TORCH_MAXCONCURRENCY: 4
TORCH_MAPPINGSFILE: /app/ontology/mapping_cql.json
TORCH_CONCEPTTREEFILE: /app/ontology/mapping_tree.json
TORCH_USECQL: false

volumes:
- "torch-data-store:/app/output" # Shared volume with torch-nginx
- ./structureDefinitions:/app/StructureDefinitions
Expand Down
Empty file.
Loading

0 comments on commit f60f8e5

Please sign in to comment.