Revert to http

FA2021-K1 · Sep 22, 2021 · 6684ddf · 6684ddf
1 parent fca1f4d
commit 6684ddf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/docker-compose.yml b/.github/workflows/docker-compose.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Test web service
         run: |
           sleep 3
-          curl -k https://localhost/v1/sensors
+          curl http://localhost/v1/sensors
       - name: Stop containers
         if: always()
         run: docker-compose down
diff --git a/WebService/Sources/Demo/Demo.swift b/WebService/Sources/Demo/Demo.swift
@@ -6,8 +6,11 @@ import ArgumentParser
 
 @main
 struct DemoWebService: WebService {
+    @Option(help: "The port the web service is offered at")
+    var port: Int = 80
+
     var configuration: Configuration {
-        HTTP2Configuration(cert: "/buoy/cert.pem", keyPath: "/buoy/key.pem")
+        HTTPConfiguration(port: port)
         REST {
             OpenAPI()
         }

diff --git a/docker-compose-development.yml b/docker-compose-development.yml
@@ -10,7 +10,7 @@ services:
       dockerfile: ./WebService/Dockerfile
     # Expose port 8080 of container on port 443 of host
     ports:
-      - "443:8080"
+      - "80:80"
     # Mount directory for config and sensor data
     volumes:
       - ../buoy:/buoy
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     image: "ghcr.io/fa21-collaborative-drone-interactions/buoywebservice:latest"
     # Expose port 8080 of container on port 443 of host
     ports:
-      - "443:8080"
+      - "80:80"
     # Mount directory for config and sensor data
     volumes:
       - ../buoy:/buoy