Skip to content
Snippets Groups Projects
Commit b2a6205b authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-doc-uid' into 'main'

DOC: add a hint how to provide a readable certificate

See merge request !2
parents c2a6cb1c b6ed8e30
Branches
Tags
1 merge request!2DOC: add a hint how to provide a readable certificate
Pipeline #29451 passed
...@@ -365,7 +365,9 @@ setup-env: ...@@ -365,7 +365,9 @@ setup-env:
# runs the unittests, currently validation tests for the profile schema # runs the unittests, currently validation tests for the profile schema
unittest: unittest:
tags: [ cached-dind ] tags: [ cached-dind ]
image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME" image: "$CI_ENVIMAGE:dev"
# TODO: Fix this
# image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME"
stage: unittest stage: unittest
script: script:
- ls - ls
...@@ -374,7 +376,9 @@ unittest: ...@@ -374,7 +376,9 @@ unittest:
# builds a docker image with the LinkAhead Server # builds a docker image with the LinkAhead Server
build: build:
tags: [ cached-dind ] tags: [ cached-dind ]
image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME" # TODO: Fix this
# image: "$CI_ENVIMAGE:$CI_COMMIT_REF_NAME"
image: "$CI_ENVIMAGE:dev"
stage: build stage: build
inherit: inherit:
variables: variables:
......
...@@ -5,7 +5,7 @@ We use docker and docker-compose to deploy CaosDB: ...@@ -5,7 +5,7 @@ We use docker and docker-compose to deploy CaosDB:
- Docker >= 18.02 - Docker >= 18.02
- docker-compose >= 1.21 - docker-compose >= 1.21
On a Debian system, you can install the requirements with: On Debian based systems, you can install the requirements with:
```sh ```sh
sudo apt-get install docker.io docker-compose sudo apt-get install docker.io docker-compose
...@@ -91,6 +91,8 @@ one with `openssl rsa -in oldKey.pem -out newKey.key`. If you want to use a ...@@ -91,6 +91,8 @@ one with `openssl rsa -in oldKey.pem -out newKey.key`. If you want to use a
certificate with a passphrase instead, please refer to envoy's documentation as certificate with a passphrase instead, please refer to envoy's documentation as
to how to configure this correctly. to how to configure this correctly.
Make sure that envoy can read the certificate. You can set the UID for envoy in
the environment section of the envoy service in `docker-compose.yml`.
## Configuration ## Configuration
......
...@@ -51,6 +51,8 @@ services: ...@@ -51,6 +51,8 @@ services:
envoy: envoy:
image: envoyproxy/envoy:v1.21-latest image: envoyproxy/envoy:v1.21-latest
# environment:
# ENVOY_UID: 987
volumes: volumes:
- type: bind - type: bind
read_only: true read_only: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment