aboutsummaryrefslogtreecommitdiff
path: root/ci/container
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2024-04-28 10:53:38 -0400
committerLibravatar vnugent <public@vaughnnugent.com>2024-04-28 10:53:38 -0400
commit96ae7b0f718302a4d3b749a90e161cfbf142ad13 (patch)
treedda50874c1b3e6d06601e15e25823f185397c41e /ci/container
parent5877c86b1da4eb4e9e74378709c546933dc63cf4 (diff)
Squashed commit of the following:v0.1.4
commit 28f0f774da975c04271445761b2de31aecf969ff Author: vnugent <public@vaughnnugent.com> Date: Sat Apr 27 23:11:48 2024 -0400 Add --no-cache arg to build image args commit 22a1f5d374ec1a487944c6303066d0f15617cb12 Author: vnugent <public@vaughnnugent.com> Date: Sat Apr 27 18:47:25 2024 -0400 fix: Upstream patch missing ! in middlware commit f40ca2d4c26f81276d58760152592a918bf3cd87 Author: vnugent <public@vaughnnugent.com> Date: Sat Apr 27 18:36:01 2024 -0400 chore: package updates commit d7a3c957467e65ea7176170fba3c280ac18ac17e Author: vnugent <public@vaughnnugent.com> Date: Sun Apr 21 12:02:57 2024 -0400 chore: Package updates and minor QOL patches commit 97a5bded5122708cf39d0e86bc24a5f31755bdd1 Merge: 56e0a38 5877c86 Author: vnugent <public@vaughnnugent.com> Date: Tue Apr 9 17:38:02 2024 -0400 Merge branch 'master' into develop commit 56e0a38b2ca246e8beeaef3c6c4b9c0ce7d0f09b Author: vnugent <public@vaughnnugent.com> Date: Tue Apr 9 17:35:13 2024 -0400 chore(app): Update deps, login spinner, curl msg, view prep commit 0945210c0492dd8a8de99ccd8e5e66cf05e3a1c1 Merge: 24fac82 3c15d54 Author: vnugent <public@vaughnnugent.com> Date: Tue Apr 2 14:58:59 2024 -0400 Merge branch 'master' into develop commit 24fac82efe9e5c18e86ed535678640e7401472db Author: vnugent <public@vaughnnugent.com> Date: Tue Apr 2 14:54:20 2024 -0400 ci: Configure manual dep versions commit d2ae31ec919d72e66d8b40db8394b55efd6ea6d3 Author: vnugent <public@vaughnnugent.com> Date: Sun Mar 31 22:19:53 2024 -0400 ci: Native compression support for win commit fa7fdef79c6d468022b77f81314ac129fe0cdc32 Merge: 308092d a01220a Author: vnugent <public@vaughnnugent.com> Date: Wed Mar 13 21:26:55 2024 -0400 Merge branch 'master' into develop commit 308092d6d743d0ba8f7ca86fd77e9c837dc46e88 Merge: 48637a8 9134093 Author: vnugent <public@vaughnnugent.com> Date: Wed Mar 13 21:01:02 2024 -0400 Merge branch 'master' into develop commit 48637a8781fc951c307216f604fc1610e68691c3 Merge: 1e08c6d e326736 Author: vnugent <public@vaughnnugent.com> Date: Wed Mar 13 16:20:35 2024 -0400 Merge branch 'master' into develop commit 1e08c6d2112459dc02a0ab873123c4a363b01d21 Author: vnugent <public@vaughnnugent.com> Date: Wed Mar 13 16:17:58 2024 -0400 ci: verified container build ready for next release commit 85a1e5b7cc5c99e97a2d4e99bbceb0d2139742ff Author: vnugent <public@vaughnnugent.com> Date: Tue Mar 12 22:05:16 2024 -0400 ci: exciting bare-metal build process, os support, smaller packages commit 748cdbf4880d830fd794e92856e8c35a46e4f884 Author: vnugent <public@vaughnnugent.com> Date: Mon Mar 11 21:21:18 2024 -0400 feat(app): #1 update libs & add curl support
Diffstat (limited to 'ci/container')
-rw-r--r--ci/container/Dockerfile3
-rw-r--r--ci/container/config-templates/SimpleBookmark-template.json20
-rw-r--r--ci/container/config-templates/config-template.json3
-rw-r--r--ci/container/docker-compose.yaml1
4 files changed, 15 insertions, 12 deletions
diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile
index b7898d4..a6d35d4 100644
--- a/ci/container/Dockerfile
+++ b/ci/container/Dockerfile
@@ -5,7 +5,7 @@
FROM alpine:3.19 as native-cont
#install public libs and build tools
-RUN apk update && apk add build-base cmake npm git
+RUN apk update && apk add --no-cache build-base cmake npm git
#most universal way to use Task is from NPM
RUN npm install -g @go-task/cli
@@ -84,6 +84,7 @@ ENV VNCACHE_CACHE_PUBLIC_KEY=""
#HTTP/PROXY Config
ENV HTTP_DOWNSTREAM_SERVERS=[]
ENV SSL_JSON="{}"
+ENV HTTP_TRACE_ON=false
#run the init script within dumb-init
ENTRYPOINT ["dumb-init", "--"]
diff --git a/ci/container/config-templates/SimpleBookmark-template.json b/ci/container/config-templates/SimpleBookmark-template.json
index c2bf780..610673e 100644
--- a/ci/container/config-templates/SimpleBookmark-template.json
+++ b/ci/container/config-templates/SimpleBookmark-template.json
@@ -7,7 +7,7 @@
"path": "/api/bookmarks", //Path for the bookmarks endpoint
- "config": {
+ "config": {
"max_limit": 100, //Max results per page
"default_limit": 20, //Default results per page
"user_quota": ${MAX_BOOKMARKS} //Max bookmarks per user
@@ -19,19 +19,17 @@
"path": "/api/lookup",
"exe_path": "curl", //Path to the curl executable
"extra_args": [
- "--globoff", //Disables unsafe url globbing
- "--no-keepalive", //Disables keepalive, uneeded for a single lookup request
- "--max-filesize",
- "100K", //Max file size 100K
- "--max-redirs",
- "5", //Max redirects 5
- "--location", //Follow redirects
+ "--globoff", //Disables unsafe url globbing
+ "--no-keepalive", //Disables keepalive, uneeded for a single lookup request
+ "--max-filesize", "100K", //Max file size 100K
+ "--max-redirs", "5", //Max redirects 5
+ "--location" //Follow redirects
]
},
"registration": {
- "path": "/api/register", //Path for the registration endpoint
- "token_lifetime_mins": ${REG_TOKEN_DURATION_MIN}, //Token lifetime in minutes
- "key_regen_interval_mins": ${REG_TOKEN_DURATION_MIN}0 //Signing key regeneration interval in minutes
+ "path": "/api/register", //Path for the registration endpoint
+ "token_lifetime_mins": ${REG_TOKEN_DURATION_MIN}, //Token lifetime in minutes
+ "key_regen_interval_mins": ${REG_TOKEN_DURATION_MIN}0 //Signing key regeneration interval in minutes
}
} \ No newline at end of file
diff --git a/ci/container/config-templates/config-template.json b/ci/container/config-templates/config-template.json
index e226efb..0bd0ddb 100644
--- a/ci/container/config-templates/config-template.json
+++ b/ci/container/config-templates/config-template.json
@@ -52,6 +52,9 @@
//Collection of objects to define hosts+interfaces to build server listeners from
"virtual_hosts": [
{
+
+ "trace": ${HTTP_TRACE_ON},
+
//The interface to bind to, you may not mix TLS and non-TLS connections on the same interface
"interface": {
"address": "0.0.0.0",
diff --git a/ci/container/docker-compose.yaml b/ci/container/docker-compose.yaml
index 1ffee2f..465615d 100644
--- a/ci/container/docker-compose.yaml
+++ b/ci/container/docker-compose.yaml
@@ -43,6 +43,7 @@ services:
#HTTP
HTTP_DOWNSTREAM_SERVERS: '[]'
+ HTTP_TRACE_ON: "false"
#SSL_JSON: '{"cert": "ssl/cert.pem", "privkey":"ssl/priv.pem"}'
SERVER_ARGS: ""