fix: try to fix marlin enclave image building

Cargo.toml

@@ -15,7 +15,7 @@ strip = true
 opt-level = 's'
 
 [workspace.package]
-version = "1.1.2"
+version = "1.1.3"
 edition = "2021"
 repository = "https://github.com/ldclabs/idempotent-proxy"
 keywords = ["idempotent", "reverse", "proxy", "icp"]

README.md

@@ -80,8 +80,8 @@ In a new terminal, run
 cd /mnt/my-server
 sudo docker exec -it nitro-cli sh
 # or docker pull enclave image
-docker build -f enclave/arm64.Dockerfile -t enclave_arm64:latest .
-nitro-cli build-enclave --docker-uri enclave_arm64:latest --output-file enclave_arm64.eif
+docker build -f enclave/amd64.Dockerfile -t enclave_amd64:latest .
+nitro-cli build-enclave --docker-uri enclave_amd64:latest --output-file enclave_amd64.eif
 ```
 
 ### Running as Cloudflare Worker

enclave/.env

@@ -0,0 +1,8 @@
+SERVER_ADDR=127.0.0.1:8088
+POLL_INTERVAL=100 # in milliseconds
+REQUEST_TIMEOUT=20000 # in milliseconds
+LOG_LEVEL=warn # debug, info, warn, error
+# cert file path to enable https, for example: /etc/https/mydomain.crt
+TLS_CERT_FILE = ""
+# key file path to enable https, for example: /etc/https/mydomain.key
+TLS_KEY_FILE = ""

enclave/amd64.Dockerfile

@@ -53,7 +53,8 @@ COPY enclave/setup.sh ./
 RUN chmod +x setup.sh
 
 # your custom setup goes here
-COPY --from=builder /src/.env ./.env
+# COPY enclave/.env ./.env
+COPY enclave/.env ../.env
 COPY --from=builder /src/target/release/idempotent-proxy-server ./idempotent-proxy-server
 
 # entry point

enclave/arm64.Dockerfile

@@ -53,8 +53,9 @@ COPY enclave/setup.sh ./
 RUN chmod +x setup.sh
 
 # your custom setup goes here
-COPY --from=builder /src/.env ./.env
+# COPY enclave/.env ./.env
+COPY enclave/.env ../.env
 COPY --from=builder /src/target/release/idempotent-proxy-server ./idempotent-proxy-server
 
 # entry point
-ENTRYPOINT [ "/app/setup.sh" ]
+ENTRYPOINT [ "./idempotent-proxy-server" ]

enclave/setup.sh

@@ -20,4 +20,4 @@ iptables -L -t nat
 
 # starting supervisord
 cat /etc/supervisord.conf
-/app/supervisord
+/app/supervisord

enclave/supervisord.conf

@@ -39,11 +39,19 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 
+[program:idempotent-proxy-server-proxy]
+command=/app/vsock-to-ip --vsock-addr 88:1200 --ip-addr 127.0.0.1:8088
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
 # your custom programs go here
 [program:idempotent-proxy-server]
 command=/app/idempotent-proxy-server
 autorestart=true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+stderr_logfile_maxbytes=0