Refactor images

Author: iKapitonau

meta-secret-vm/recipes-core/attest-tool/attest-tool.bb

@@ -7,6 +7,7 @@ SRC_URI = "file://${THISDIR}/files"
 S = "${WORKDIR}/${THISDIR}/files"
 
 DEPENDS += "intel-sgx-primitives"
+RDEPENDS:${PN} += "intel-sgx-primitives"
 
 do_compile() {
     ${CC} ${LDFLAGS} -O2 attest_tool.cpp -ltdx_attest -o attest-tool

meta-secret-vm/recipes-core/images/secret-vm-rootfs-common-dev.inc

@@ -0,0 +1,5 @@
+ROOTFS_POSTPROCESS_COMMAND += "add_env;"
+
+add_env() {
+    echo "DEBUG=true" >> ${IMAGE_ROOTFS}/etc/environment
+}

meta-secret-vm/recipes-core/images/secret-vm-rootfs-prod.inc renamed to meta-secret-vm/recipes-core/images/secret-vm-rootfs-common-prod.inc

@@ -8,8 +8,7 @@ IMAGE_INSTALL = "base-files \
                  systemd \
                  secret-vm-attest-rest-server \
                  secret-vm-scripts \
-                 docker-compose \
-                 intel-sgx-primitives"
+                 docker-compose"
 
 IMAGE_FSTYPES = "cpio"
 

meta-secret-vm/recipes-core/images/secret-vm-rootfs.inc renamed to meta-secret-vm/recipes-core/images/secret-vm-rootfs-common.inc

@@ -1 +1,2 @@
-include secret-vm-rootfs.inc
+include secret-vm-rootfs-common.inc
+include secret-vm-rootfs-common-dev.inc

meta-secret-vm/recipes-core/images/secret-vm-rootfs-dev.bb

@@ -1 +1,2 @@
 include secret-vm-rootfs-gpu.inc
+include secret-vm-rootfs-common-dev.inc

meta-secret-vm/recipes-core/images/secret-vm-rootfs-gpu-dev.bb

@@ -1,2 +1,2 @@
 include secret-vm-rootfs-gpu.inc
-include secret-vm-rootfs-prod.inc
+include secret-vm-rootfs-common-prod.inc

meta-secret-vm/recipes-core/images/secret-vm-rootfs-gpu-prod.bb

@@ -1,4 +1,4 @@
-include secret-vm-rootfs.inc
+include secret-vm-rootfs-common.inc
 
 IMAGE_INSTALL += "secret-vm-scripts-gpu \
                   acpid \

meta-secret-vm/recipes-core/images/secret-vm-rootfs-gpu.inc

@@ -1,2 +1,2 @@
-include secret-vm-rootfs.inc
-include secret-vm-rootfs-prod.inc
+include secret-vm-rootfs-common.inc
+include secret-vm-rootfs-common-prod.inc

meta-secret-vm/recipes-core/images/secret-vm-rootfs-prod.bb

@@ -30,7 +30,7 @@
 #
 # Outputs:
 #   - {dest_dir}/{prefix}_private.pem: Private key file in PEM format
-#p   - {dest_dir}/{prefix}_cert.pem: Let's Encrypt signed X.509 certificate in PEM format
+#   - {dest_dir}/{prefix}_cert.pem: Let's Encrypt signed X.509 certificate in PEM format
 #   - {dest_dir}/{prefix}_public.pem: Public key extracted from the certificate in PEM format
 #   - {dest_dir}/{prefix}_chain.pem: Certificate chain in PEM format
 #
@@ -41,10 +41,10 @@ generate_cert() {
     local email="${4:-secretvm@scrtlabs.com}"   # Email for Let's Encrypt notifications
 
     local certbot='docker run --rm
-		    -v /etc/letsencrypt:/etc/letsencrypt
-		    -v /var/lib/letsencrypt:/var/lib/letsencrypt
-		    -p 80:80
-		    certbot/certbot'
+                       -v /etc/letsencrypt:/etc/letsencrypt
+                       -v /var/lib/letsencrypt:/var/lib/letsencrypt
+                       -p 80:80
+                       certbot/certbot'
 
     # Ensure certbot and openssl are installed
     #if ! command -v certbot &> /dev/null; then
@@ -77,9 +77,14 @@ generate_cert() {
 
     echo "Requesting Let's Encrypt certificate for domain: ${domain}"
 
+    STAGING_FLAG=""
+    if [ -n "$DEBUG" ]; then
+        STAGING_FLAG="--staging"
+    fi
+
     # Request certificate using certbot in standalone mode
     if ! $certbot certonly --standalone \
-	--staging \
+        $STAGING_FLAG \
         --non-interactive \
         --agree-tos \
         --email "${email}" \