Fix windows docker compose args

DataDog · Jan 30, 2025 · ba43286 · ba43286
1 parent 24310a5
commit ba43286
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/.github/workflows/fips-test.yml b/.github/workflows/fips-test.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         platform: [linux, windows]
         agent-type: [fips-agent, standard-agent]
-    runs-on: ${{ matrix.platform == 'linux' && 'ubuntu-22.04' || 'windows-2022' }}
+    runs-on: ${{ matrix.platform == 'linux' && 'ubuntu-22.04' || 'windows-2025' }}
     name: "Test FIPS"
 
     env:
@@ -59,7 +59,7 @@ jobs:
     - name: Set up Windows containers
       if: matrix.platform == 'windows'
       env:
-        AGENT_IMAGE: "${{ matrix.agent-type == 'fips-agent' && 'datadog/agent-dev:master-py3-win-servercore' || 'datadog/agent-dev:master-py3-win-servercore' }}"
+        AGENT_IMAGE: "${{ matrix.agent-type == 'fips-agent' && 'main-py3-fips-win-servercore-ltsc2022' || 'datadog/agent-dev:master-py3-win-servercore' }}"
         DD_API_KEY: ${{ secrets.DD_API_KEY }}
       run: |
         docker compose -f .github/workflows/fips/compose/compose-windows.yml up -d

diff --git a/.github/workflows/fips/compose/compose-linux.yml b/.github/workflows/fips/compose/compose-linux.yml
@@ -19,7 +19,7 @@ services:
   http-server-fips:
     build:
       context: server
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-nix
       args:
         BUILD_TARGET: http-server
     command: ["./http-server", "ECDHE-RSA-AES128-SHA256"]
@@ -32,7 +32,7 @@ services:
   http-server:
     build:
       context: server
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-nix
       args:
         BUILD_TARGET: http-server
     command: ["./http-server", "ECDHE-RSA-CHACHA20-POLY1305"]

diff --git a/.github/workflows/fips/compose/compose-windows.yml b/.github/workflows/fips/compose/compose-windows.yml
@@ -1,23 +1,23 @@
 services:
-  agent:
-    image: $AGENT_IMAGE
-    pid: host
-    environment:
-      - DD_API_KEY=$DD_API_KEY
-      - DD_SITE=datad0g.com
-    volumes:
-      - \\.\pipe\docker_engine:\\.\pipe\docker_engine
-      - "./agent/conf.d:C:/ProgramData/Datadog/conf.d"
-      - "./agent/checks.d:C:/ProgramData/Datadog/checks.d"
-    healthcheck:
-      test: ["CMD", "agent", "status"]
-      interval: 5s
-      timeout: 2s
-      retries: 3
+  # agent:
+  #   image: $AGENT_IMAGE
+  #   pid: host
+  #   environment:
+  #     - DD_API_KEY=$DD_API_KEY
+  #     - DD_SITE=datad0g.com
+  #   volumes:
+  #     - \\.\pipe\docker_engine:\\.\pipe\docker_engine
+  #     - "./agent/conf.d:C:/ProgramData/Datadog/conf.d"
+  #     - "./agent/checks.d:C:/ProgramData/Datadog/checks.d"
+  #   healthcheck:
+  #     test: ["CMD", "agent", "status"]
+  #     interval: 5s
+  #     timeout: 2s
+  #     retries: 3
   http-server-fips:
     build:
       context: server
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-win
       args:
         BUILD_TARGET: http-server.exe
     command: ["C:/app/http-server.exe", "ECDHE-RSA-AES128-SHA256"]
@@ -30,7 +30,7 @@ services:
   http-server:
     build:
       context: server
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-win
       args:
         BUILD_TARGET: http-server.exe
     command: ["C:/app/http-server.exe", "ECDHE-RSA-CHACHA20-POLY1305"]

diff --git a/.../workflows/fips/compose/server/Dockerfile → ...kflows/fips/compose/server/Dockerfile-nix b/.../workflows/fips/compose/server/Dockerfile → ...kflows/fips/compose/server/Dockerfile-nix
diff --git a/.github/workflows/fips/compose/server/Dockerfile-win b/.github/workflows/fips/compose/server/Dockerfile-win
@@ -0,0 +1,15 @@
+FROM golang:1.23
+
+WORKDIR /app
+
+# Copy all files
+COPY . ./
+
+ENV GO111MODULE=off
+
+# Build the server
+ARG BUILD_TARGET
+RUN go build -o $env:BUILD_TARGET http-server.go
+
+# Expose port 443
+EXPOSE 443