Replace opi-web-server with httpd-alpine

Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Feb 11, 2023 · 3c34007 · 3c34007
1 parent 149db90
commit 3c34007
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/integration/docker-compose.pxe.yml b/integration/docker-compose.pxe.yml
@@ -30,15 +30,16 @@ services:
     command: --script broadcast-dhcp-discover
 
   web:
-    image: ghcr.io/opiproject/opi-web:main@sha256:4626f2bec0eb9baf4a4293b58bcf0bd395e16cc07b2873f11b01c5d80d8623bc
+    image: docker.io/library/httpd:2.4.55-alpine3.17
     ports:
-      - 8082:8082
+      - 8082:80
+    volumes:
+      - ./sztp/my-boot-image.img:/usr/local/apache2/htdocs/my-boot-image.img
     networks:
       xpu-cpu:
         ipv4_address: 10.127.127.16
     healthcheck:
-      test: curl --silent --fail http://localhost:8082 || exit 1
-    command: python3 -m http.server 8082
+      test: wget --silent --fail http://localhost:80 || exit 1
 
   bootstrap:
     image: ghcr.io/opiproject/opi-sztp-server:main@sha256:0560c4cb88c38d10f0c7a1de91b7147143c81f13a428587d7f71cb753b5a74e4

diff --git a/integration/scripts/integration.sh b/integration/scripts/integration.sh
@@ -39,7 +39,7 @@ run_integration_tests() {
     echo wait 5s... && sleep 5s
     curl --fail http://127.0.0.1:8001/redfish/v1/Systems/437XR1138R2
     curl --fail http://127.0.0.1:8002/redfish/v1/Systems/437XR1138R2
-    curl --fail http://127.0.0.1:8082/var/lib/misc/
+    curl --fail http://127.0.0.1:8082/
 
     for i in $(seq 1 20)
     do

diff --git a/integration/sztp/my-boot-image.img b/integration/sztp/my-boot-image.img