From fcce174b431f7f92b0842a97d99e45f5caefa69d Mon Sep 17 00:00:00 2001 From: "D.Hommen" <75446820+dhommen@users.noreply.github.com> Date: Wed, 24 Jan 2024 00:14:46 +0100 Subject: [PATCH] feat(server): init logging-house-server with publish job * feat(server): init logging-house-server with publish job * fix(server): add missing keyword jobs to ci file * fix(server): resolve duplicate names in jobs * chore: add example compose file * docs(server): link basecamp configuration docs * chore: fix publish trigger for server --- .github/workflows/publish-server.yml | 47 ++++++++++++++++++++++++++++ README.md | 2 +- docker-compose.yml | 45 ++++++++++++++++++++++++++ docs/SUMMARY.md | 2 +- docs/configuration.md | 9 ++++++ logging-house-server/app/Dockerfile | 1 + logging-house-server/edc/Dockerfile | 1 + 7 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/publish-server.yml create mode 100644 docker-compose.yml create mode 100644 docs/configuration.md create mode 100644 logging-house-server/app/Dockerfile create mode 100644 logging-house-server/edc/Dockerfile diff --git a/.github/workflows/publish-server.yml b/.github/workflows/publish-server.yml new file mode 100644 index 0000000..25668f6 --- /dev/null +++ b/.github/workflows/publish-server.yml @@ -0,0 +1,47 @@ +name: Publish-Server +on: + push: + branches: ["main"] + paths: ["logging-house-server/**/*"] + +jobs: + publish-app: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + id-token: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Login to GitHub Container Registry + run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin + + - name: Build Docker image + run: cd logging-house-server/app && docker build -t ghcr.io/truzzt/mds-ap3/app:0.1.0 . + + - name: Push Docker image + run: docker push ghcr.io/truzzt/mds-ap3/app:0.1.0 + + + publish-edc: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + id-token: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Login to GitHub Container Registry + run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin + + - name: Build Docker image + run: cd logging-house-server/edc && docker build -t ghcr.io/truzzt/mds-ap3/edc:0.1.0 . + + - name: Push Docker image + run: docker push ghcr.io/truzzt/mds-ap3/edc:0.1.0 diff --git a/README.md b/README.md index 84c7d79..0778c3e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ npm install ## Usage ```sh -docker run +docker compose up ``` ## Run tests diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b955055 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,45 @@ +version: "3.8" + +services: + edc: + image: ghcr.io/truzzt/mds-ap3/edc:0.1.0 + environment: + WEB_HTTP_PORT: + WEB_HTTP_PATH: + WEB_HTTP_IDS_PORT: + WEB_HTTP_IDS_PATH: + MY_EDC_FQDN: + MY_EDC_NAME_KEBAB_CASE: + MY_EDC_TITLE: + MY_EDC_DESCRIPTION: + MY_EDC_CURATOR_URL: + MY_EDC_CURATOR_NAME: + EDC_API_AUTH_KEY: + MY_EDC_MAINTAINER_URL: + MY_EDC_MAINTAINER_NAME: + EDC_OAUTH_TOKEN_URL: + EDC_OAUTH_PROVIDER_JWKS_URL: + EDC_OAUTH_PROVIDER_AUDIENCE: + EDC_OAUTH_CLIENT_ID: + EDC_KEYSTORE: + EDC_KEYSTORE_PASSWORD: + EDC_VAULT: + EDC_OAUTH_CERTIFICATE_ALIAS: + EDC_OAUTH_PRIVATE_KEY_ALIAS: + TRUZZT_CLEARINGHOUSE_JWT_AUDIENCE: + TRUZZT_CLEARINGHOUSE_JWT_ISSUER: + TRUZZT_CLEARINGHOUSE_JWT_SIGN_SECRET: + TRUZZT_CLEARINGHOUSE_JWT_EXPIRES_AT: + TRUZZT_CLEARINGHOUSE_APP_BASE_URL: http://app:8000 + + app: + image: ghcr.io/truzzt/mds-ap3/app:0.1.0 + environment: + SHARED_SECRET: + SERVICE_ID_LOG: + + mongodb: + image: mongo:5 + environment: + MONGO_INITDB_DATABASE: process + diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index d9c1487..853cc31 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -1,5 +1,5 @@ # Summary -- [Installation]() +- [Configuration](./configuration.md) - [Use]() - [Developing]() diff --git a/docs/configuration.md b/docs/configuration.md new file mode 100644 index 0000000..54c6668 --- /dev/null +++ b/docs/configuration.md @@ -0,0 +1,9 @@ +# Configuration + +## EDC + +- [Configuration](https://ids-basecamp.github.io/clearinghouse/content/admin-guide/ch-edc_installation.html) + +## App + +- [Configuration](https://ids-basecamp.github.io/clearinghouse/content/admin-guide/ch-app_installation.html) diff --git a/logging-house-server/app/Dockerfile b/logging-house-server/app/Dockerfile new file mode 100644 index 0000000..0a833ee --- /dev/null +++ b/logging-house-server/app/Dockerfile @@ -0,0 +1 @@ +FROM ghcr.io/truzzt/ids-basecamp-clearing/ch-app:1.0.0-alpha.7 diff --git a/logging-house-server/edc/Dockerfile b/logging-house-server/edc/Dockerfile new file mode 100644 index 0000000..f8677d0 --- /dev/null +++ b/logging-house-server/edc/Dockerfile @@ -0,0 +1 @@ +FROM ghcr.io/truzzt/ids-basecamp-clearing/ch-edc:1.0.0-alpha.7