- added new docker-compose file for hosting

api/evaluationapi.yaml

@@ -8,7 +8,7 @@ info:
   license:
     name: Apache 2.0
     url: http://www.apache.org/licenses/LICENSE-2.0.html
-  version: '0.2'
+  version: '0.3'
 servers:
   - url: '{protocol}://{environment}:{port}/api/'
     variables:
@@ -225,6 +225,10 @@ components:
           type: string
           description: The description of the Scenario.
           example: 'Das ist das erste tolle Szenario mit den Antworten aus Llama-2-13b-chat-hf_responses_rated_by_gpt-3.5-turbo.json'
+        systemPrompt:
+          type: string
+          description: The used systemprompt for the scenario.
+          example: '....'
         totalResponseCount:
           type: integer
           format: int32

build/reval/Dockerfile

@@ -57,6 +57,7 @@ ENV GIN_MODE=release
 
 EXPOSE 8080
 
-USER nonroot:nonroot
+# causes file permission issues under ubutu, but was working on windows an macos
+# USER nonroot:nonroot
 
 ENTRYPOINT ["./reval"]

cmd/reval/main.go

@@ -28,14 +28,14 @@ func main() {
 	})
 
 	//register folder for static web deployment
-	r.Static("/ui/", config.Current.Gin_Web_Path)
+	r.Static(config.Current.Gin_Web_BaseUrl, config.Current.Gin_Web_Path)
 
 	//setup CORS
 	corsConfig := cors.DefaultConfig()
 	corsConfig.AllowHeaders = append(corsConfig.AllowHeaders, config.Current.Gin_Cors_AdditionalAllowedHeaders...)
 	corsConfig.AllowAllOrigins = config.Current.Gin_Cors_AllowAllOrigins
 	r.Use(cors.New(corsConfig))
-	r.Use(oidc.OidcAuthMiddleware(config.Current.Oidc_Authority, config.Current.Oidc_Audience))
+	r.Use(oidc.OidcAuthMiddleware(config.Current.Oidc_Authority, config.Current.Oidc_Audience, config.Current.Gin_Api_BaseUrl))
 
 	//register HTTP handlers for evaluatio api
 	si := new(controller.EvaluationApiServerInterface)

docker-compose-reval.yaml

@@ -0,0 +1,48 @@
+services:
+  reval:
+    container_name: reval
+    image: local/reval:latest
+    depends_on:
+     - nginx-proxy
+     - nginx-proxy-acme
+    environment:
+      - OIDC_AUDIENCE=https://reval.th-b.com/api
+      - VIRTUAL_HOST=reval.th-b.com
+      - LETSENCRYPT_HOST=reval.th-b.com
+      - LETSENCRYPT_EMAIL=webmaster@th-b.com
+    ports:
+      - "8080:8080"
+    volumes:
+      - "./tmp/:/app/data/" #sqlite database path
+
+# This services are required to run an NGINX reverse proxy that can isse let's encrypt certificates
+  nginx-proxy:
+    container_name: nginx-proxy
+    image: nginxproxy/nginx-proxy  
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "./tmp/hosting/certs:/etc/nginx/certs"
+      - "./tmp/hosting/vhost:/etc/nginx/vhost.d"
+      - "./tmp/hosting/html:/usr/share/nginx/html"
+      - "/var/run/docker.sock:/tmp/docker.sock:ro"
+
+  nginx-proxy-acme:
+    container_name: nginx-proxy-acme
+    image: nginxproxy/acme-companion
+    depends_on:
+     - nginx-proxy
+    environment:
+      - DEFAULT_EMAIL=webmaster@th-b.com
+      - NGINX_PROXY_CONTAINER=nginx-proxy
+    volumes:
+      - "./tmp/hosting/certs:/etc/nginx/certs"
+      - "./tmp/hosting/vhost:/etc/nginx/vhost.d"
+      - "./tmp/hosting/html:/usr/share/nginx/html"
+      - "/var/run/docker.sock:/tmp/docker.sock:ro"
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "./tmp/hosting/acme:/etc/acme.sh"
+volumes:
+  hosting:
+    external: true