From 3c15d5471d5134f072365378b04693903419b092 Mon Sep 17 00:00:00 2001 From: vnugent Date: Tue, 2 Apr 2024 14:58:43 -0400 Subject: Squashed commit of the following: commit 24fac82efe9e5c18e86ed535678640e7401472db Author: vnugent Date: Tue Apr 2 14:54:20 2024 -0400 ci: Configure manual dep versions commit d2ae31ec919d72e66d8b40db8394b55efd6ea6d3 Author: vnugent Date: Sun Mar 31 22:19:53 2024 -0400 ci: Native compression support for win commit fa7fdef79c6d468022b77f81314ac129fe0cdc32 Merge: 308092d a01220a Author: vnugent Date: Wed Mar 13 21:26:55 2024 -0400 Merge branch 'master' into develop commit 308092d6d743d0ba8f7ca86fd77e9c837dc46e88 Merge: 48637a8 9134093 Author: vnugent Date: Wed Mar 13 21:01:02 2024 -0400 Merge branch 'master' into develop commit 48637a8781fc951c307216f604fc1610e68691c3 Merge: 1e08c6d e326736 Author: vnugent Date: Wed Mar 13 16:20:35 2024 -0400 Merge branch 'master' into develop commit 1e08c6d2112459dc02a0ab873123c4a363b01d21 Author: vnugent Date: Wed Mar 13 16:17:58 2024 -0400 ci: verified container build ready for next release commit 85a1e5b7cc5c99e97a2d4e99bbceb0d2139742ff Author: vnugent Date: Tue Mar 12 22:05:16 2024 -0400 ci: exciting bare-metal build process, os support, smaller packages commit 748cdbf4880d830fd794e92856e8c35a46e4f884 Author: vnugent Date: Mon Mar 11 21:21:18 2024 -0400 feat(app): #1 update libs & add curl support --- ci/container/Dockerfile | 1 + ci/container/Taskfile.yaml | 14 -------------- ci/container/config-templates/config-template.json | 3 ++- ci/container/docker-compose.yaml | 1 + 4 files changed, 4 insertions(+), 15 deletions(-) (limited to 'ci/container') 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" -- cgit