Compare commits

..

No commits in common. "30e447dc8aeb29db23d873fd9629515ed73f510c" and "495e5c350ebf220d7beafb322853845625c2564d" have entirely different histories.

6 changed files with 26 additions and 40 deletions

View File

@ -19,7 +19,6 @@
* ✅ Streaming responses in slow operations like scaling down
or building
* Make more things configurable / remove hardcoded stuff
* admin/admin auth
* CD for binaries and images for at least arm64/x86
* Multi-container docker logs [faaso logs -f FUNKO]
* ✅ Direct error and above to stderr, others to stdout,

View File

@ -1,21 +1,18 @@
{
http_port 8888
https_port 8887
local_certs
http_port 8888
https_port 8887
local_certs
}
http://*:8888 {
forward_auth /admin/* http://127.0.0.1:3000 {
uri http://127.0.0.1:3000
copy_headers {
Authorization
}
basicauth /admin/* {
admin {$FAASO_PASSWORD}
}
handle_path /admin/terminal/* {
reverse_proxy /* http://127.0.0.1:7681
}
handle_path /admin/* {
reverse_proxy /* http://127.0.0.1:3000
}
handle_path /admin/terminal/* {
reverse_proxy /* http://127.0.0.1:7681
}
handle_path /admin/* {
reverse_proxy /* http://127.0.0.1:3000
}
}

View File

@ -44,10 +44,6 @@ shards:
git: https://github.com/kemalcr/kemal.git
version: 1.5.0
kemal-basic-auth:
git: https://github.com/kemalcr/kemal-basic-auth.git
version: 1.0.0
radix:
git: https://github.com/luislavena/radix.git
version: 0.4.1

View File

@ -16,7 +16,7 @@ license: MIT
dependencies:
crest:
github: mamantoha/crest
github: mamantoha/crest
crinja:
github: straight-shoota/crinja
crystar:
@ -28,12 +28,10 @@ dependencies:
branch: add_exposed_ports
kemal:
github: kemalcr/kemal
kemal-basic-auth:
github: kemalcr/kemal-basic-auth
rucksack:
github: busyloop/rucksack
inotify:
github: petoem/inotify.cr
scripts:
postinstall: cat .rucksack >> bin/faaso

View File

@ -5,12 +5,9 @@ require "./terminal.cr"
require "compress/gzip"
require "crystar"
require "docr"
require "kemal-basic-auth"
require "kemal"
require "uuid"
basic_auth "admin", "admin"
macro version
"{{ `grep version shard.yml | cut -d: -f2` }}".strip()
end

View File

@ -30,25 +30,24 @@ module Proxy
containers = docker_api.containers.list(all: true)
config = <<-CONFIG
{
http_port 8888
https_port 8887
local_certs
http_port 8888
https_port 8887
local_certs
}
http://*:8888 {
forward_auth /admin/* http://127.0.0.1:3000 {
uri http://127.0.0.1:3000
copy_headers {
Authorization
}
basicauth /admin/* {
admin {$FAASO_PASSWORD}
}
handle_path /admin/terminal/* {
reverse_proxy /* http://127.0.0.1:7681
}
handle_path /admin/* {
reverse_proxy /* http://127.0.0.1:3000
}
handle_path /admin/terminal/* {
reverse_proxy /* http://127.0.0.1:7681
}
handle_path /admin/* {
reverse_proxy /* http://127.0.0.1:3000
}
CONFIG
funkos = Funko::Funko.from_docker