diff options
Diffstat (limited to 'ci/container')
| -rw-r--r-- | ci/container/Dockerfile | 1 | ||||
| -rw-r--r-- | ci/container/Taskfile.yaml | 14 | ||||
| -rw-r--r-- | ci/container/config-templates/config-template.json | 3 | ||||
| -rw-r--r-- | ci/container/docker-compose.yaml | 1 |
4 files changed, 4 insertions, 15 deletions
diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile index f5ac798..b7898d4 100644 --- a/ci/container/Dockerfile +++ b/ci/container/Dockerfile @@ -66,6 +66,7 @@ ENV MAX_LOGIN_ATTEMPS=10 #HC Vault ENV HC_VAULT_ADDR="" ENV HC_VAULT_TOKEN="" +ENV HC_VAULT_TRUST_CERT=false #VNCACHE (default to memory only) ENV CACHE_ASM_PATH=VNLib.Data.Caching.Providers.VNCache.dll diff --git a/ci/container/Taskfile.yaml b/ci/container/Taskfile.yaml index 557e48d..69dff71 100644 --- a/ci/container/Taskfile.yaml +++ b/ci/container/Taskfile.yaml @@ -51,9 +51,6 @@ tasks: - task: prune-sql-runtimes - #install rpmalloc - - task: install-rpmalloc-lib - postbuild_success: cmds: #tar up the build directory and move it to the output bin directory @@ -66,17 +63,6 @@ tasks: cmds: - cmd: powershell -Command "rm -Recurse -Force ./build" - install-rpmalloc-lib: - internal: true - cmds: - #install compressor plugin - - task: install:install - vars: - PROJECT_NAME: 'vnlib_rpmalloc' - MODULE_NAME: "VNLib.Core" - FILE_NAME: "src.tgz" - DIR: './build/app/lib/vnlib_rpmalloc' - setup-container-image: internal: true cmds: diff --git a/ci/container/config-templates/config-template.json b/ci/container/config-templates/config-template.json index 10092dd..e226efb 100644 --- a/ci/container/config-templates/config-template.json +++ b/ci/container/config-templates/config-template.json @@ -109,7 +109,8 @@ //HASHICORP VAULT "hashicorp_vault": { "url": "${HC_VAULT_ADDR}", - "token": "${HC_VAULT_TOKEN}" + "token": "${HC_VAULT_TOKEN}", + "trust_certificate": ${HC_VAULT_TRUST_CERT}, }, //SQL CONFIG diff --git a/ci/container/docker-compose.yaml b/ci/container/docker-compose.yaml index 03eb815..1ffee2f 100644 --- a/ci/container/docker-compose.yaml +++ b/ci/container/docker-compose.yaml @@ -23,6 +23,7 @@ services: #HC Vault HC_VAULT_ADDR: "" HC_VAULT_TOKEN: "" + HC_VAULT_TRUST_CERT: "false" #VNCACHE (default to memory only) CACHE_ASM_PATH: "VNLib.Data.Caching.Providers.VNCache.dll" MEMCACHE_ONLY: "true" |