ralsina/faaso
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Compare commits

base: ralsina:30e447dc8aeb29db23d873fd9629515ed73f510c
Branches Tags
ralsina:main
..
compare: ralsina:495e5c350ebf220d7beafb322853845625c2564d
Branches Tags
ralsina:main

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

6 changed files with 26 additions and 40 deletions
Show Stats Expand all files Collapse all files

1
TODO.md
View File

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

25
config/Caddyfile
View File

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

4
shard.lock
View File

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

2
shard.yml
View File

@ -28,8 +28,6 @@ dependencies:
branch: add_exposed_ports branch: add_exposed_ports
kemal: kemal:
github: kemalcr/kemal github: kemalcr/kemal
kemal-basic-auth:
github: kemalcr/kemal-basic-auth
rucksack: rucksack:
github: busyloop/rucksack github: busyloop/rucksack
inotify: inotify:

3
src/daemon/main.cr
View File

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

27
src/daemon/proxy.cr
View File

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