TODO.md

@@ -22,17 +22,13 @@
   * ✅ Make server take options from file
   * ✅ Make server take options from environment
   * ✅ Make server password configurable
-  * admin/admin auth client side [WIP, broke everything]
+  * admin/admin auth client side
-  * `faaso login` is not working properly yet with proxy
 * 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,
   while keeping logging level configurable
 * ✅ Fix proxy reload / Make it reload on file changes
 * Implement `faaso help command`
-* Fix `export examples/hello_crystal` it has a `template/`
-* Implement zero-downtime rollout 
-* Cleanup `tmp/` after use unless `DEBUG` is set
 
 # Things to do but not before release
 

config/faaso.yml

@@ -1 +1 @@
-password: adminfoo
+password: admin

config/funkos

@@ -1,8 +0,0 @@
-
-      handle_path /faaso/hello/* {
-        reverse_proxy /* http://faaso-hello-9zth8p:3000 {
-          health_uri /ping
-          fail_duration 30s
-        }
-      }
-      

examples/hello_crystal/README.md

@@ -1,11 +1,3 @@
-# Readme for Hello_crystal
+# README
 
-This is a funko using the Crystal runtime for [FaaSO](https://git.ralsina.me/ralsina/faaso)
+This is the readme for people trying to *use* this runtime.
-
-## What is Hello_crystal
-
-Write here what it is
-
-## How to use Hello_crystal
-
-And so on.

examples/hello_crystal/shard.yml

@@ -1,14 +0,0 @@
-name: hello_crystal
-version: 0.1.0
-
-targets:
-  funko:
-    main: main.cr
-
-dependencies:
-  kemal:
-    github: kemalcr/kemal
-
-# development_dependencies:
-#   webmock:
-#     github: manastech/webmock.cr

runtimes/crystal/Dockerfile.j2

@@ -10,7 +10,7 @@ RUN shards build --release
 RUN strip bin/*
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine as ship
-RUN apk update && apk upgrade && apk add pcre2 libgcc gc libevent curl {{ ship_packages | join " " }} && apk cache clean
+RUN apk update && apk upgrade && apk add openssl pcre2 libgcc gc libevent curl {{ ship_packages | join " " }} && apk cache clean
 RUN addgroup -S app && adduser app -S -G app
 
 WORKDIR /home/app

src/daemon/funko.cr

@@ -127,7 +127,7 @@ module Funko
 
   # Helper to run faaso locally and respond via env
   def run_faaso(args : Array(String), env) : Bool
-    Log.info { "Running faaso [#{args.join(", ")}, -l, 2>&1]" }
+    Log.info { "Running faaso [#{args.join(", ")}, -l]" }
     Process.run(
       command: "faaso",
       args: args + ["-l", "2>&1"], # Always local in the server

src/funko.cr

@@ -99,8 +99,7 @@ module Funko
           sleep 0.1.seconds
         }
       else
-        # Sort them older to newer, so we stop the oldest
+        containers.select { |container| container.@state == "running" }.sort! { |i, j|
-        containers.sort! { |i, j|
           i.@created <=> j.@created
         }.each { |container|
           Log.info { "Removing instance" }