fix: move images to top folder

Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
opiproject · Jun 17, 2024 · b2faebe · b2faebe
1 parent c2f36c5
commit b2faebe
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         condition: service_completed_successfully
     volumes:
       - server-certs:/certs
-      - ./sztp-server/images:/media
+      - ./images:/media
       - ./sztp-server/config:/mnt
       - ./sztp-server/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
     entrypoint: /usr/local/bin/docker-entrypoint.sh
@@ -147,7 +147,7 @@ services:
         condition: service_completed_successfully
     volumes:
       - server-certs:/certs
-      - ./sztp-server/images:/usr/local/apache2/htdocs
+      - ./images:/usr/local/apache2/htdocs
     ports:
       - 443:443
     networks:

diff --git a/sztp-server/images/first-boot-image.img → images/first-boot-image.img b/sztp-server/images/first-boot-image.img → images/first-boot-image.img
diff --git a/sztp-server/images/second-boot-image.img → images/second-boot-image.img b/sztp-server/images/second-boot-image.img → images/second-boot-image.img
diff --git a/sztp-server/images/third-boot-image.img → images/third-boot-image.img b/sztp-server/images/third-boot-image.img → images/third-boot-image.img
diff --git a/scripts/change_image.sh b/scripts/change_image.sh
@@ -14,7 +14,7 @@ sleep 5
 docker-compose ps
 
 # define values
-BOOT_IMG_FULL_PATH=../sztp-server/images/my-second-boot-image.img
+BOOT_IMG_FULL_PATH=../images/my-second-boot-image.img
 BOOTSTRAP_URL=http://localhost:7080/restconf/ds/ietf-datastores:running
 BOOT_IMG_PATH=$(basename ${BOOT_IMG_FULL_PATH})
 BOOT_IMG_HASH_VAL=$(openssl dgst -sha256 -c ${BOOT_IMG_FULL_PATH} | awk '{print $2}')