Unify linux and windows server

DataDog · Jan 30, 2025 · 76d3b33 · 76d3b33
1 parent b9f548e
commit 76d3b33
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 159 deletions.
diff --git a/.github/workflows/fips/compose/compose-linux.yml b/.github/workflows/fips/compose/compose-linux.yml
@@ -18,11 +18,11 @@ services:
       retries: 3
   http-server-fips:
     build:
-      context: linux
+      context: server
       dockerfile: Dockerfile
       args:
-        - "BUILD_TARGET=server"
-    command: ["./server", "ECDHE-RSA-AES128-SHA256"]
+        - "BUILD_TARGET=http-server"
+    command: ["./http-server", "ECDHE-RSA-AES128-SHA256"]
     healthcheck:
       test: "curl -f localhost:443"
       start_period: 5s
@@ -31,11 +31,11 @@ services:
       retries: 3
   http-server:
     build:
-      context: linux
+      context: server
       dockerfile: Dockerfile
       args:
         - "BUILD_TARGET=server"
-    command: ["./server", "ECDHE-RSA-CHACHA20-POLY1305"]
+    command: ["./http-server", "ECDHE-RSA-CHACHA20-POLY1305"]
     healthcheck:
       test: "curl -f localhost:443"
       start_period: 5s

diff --git a/.github/workflows/fips/compose/compose-windows.yml b/.github/workflows/fips/compose/compose-windows.yml
@@ -16,7 +16,7 @@ services:
       retries: 3
   http-server-fips:
     build:
-      context: windows
+      context: server
       dockerfile: Dockerfile
       args:
         - "BUILD_TARGET=http-server.exe"
@@ -29,7 +29,7 @@ services:
       retries: 3
   http-server:
     build:
-      context: windows
+      context: server
       dockerfile: Dockerfile
       args:
         - "BUILD_TARGET=http-server.exe"

diff --git a/...b/workflows/fips/compose/linux/Dockerfile → .../workflows/fips/compose/server/Dockerfile b/...b/workflows/fips/compose/linux/Dockerfile → .../workflows/fips/compose/server/Dockerfile
diff --git a/.github/workflows/fips/compose/linux/ca.crt → .github/workflows/fips/compose/server/ca.crt b/.github/workflows/fips/compose/linux/ca.crt → .github/workflows/fips/compose/server/ca.crt
diff --git a/.github/workflows/fips/compose/linux/ca.key → .github/workflows/fips/compose/server/ca.key b/.github/workflows/fips/compose/linux/ca.key → .github/workflows/fips/compose/server/ca.key
diff --git a/...rkflows/fips/compose/linux/http-server.go → ...kflows/fips/compose/server/http-server.go b/...rkflows/fips/compose/linux/http-server.go → ...kflows/fips/compose/server/http-server.go
diff --git a/.github/workflows/fips/compose/windows/Dockerfile b/.github/workflows/fips/compose/windows/Dockerfile
diff --git a/.github/workflows/fips/compose/windows/ca.crt b/.github/workflows/fips/compose/windows/ca.crt
diff --git a/.github/workflows/fips/compose/windows/ca.key b/.github/workflows/fips/compose/windows/ca.key
diff --git a/.github/workflows/fips/compose/windows/http-server.go b/.github/workflows/fips/compose/windows/http-server.go