chore(docker): fix docker build (#237)

* fix docker build Signed-off-by: smtmfft <smtm@taiko.xyz> * fix: some docker stuff (#239) --------- Signed-off-by: smtmfft <smtm@taiko.xyz> Co-authored-by: johntaiko <john@taiko.xyz>
taikoxyz · May 22, 2024 · 520df33 · 520df33
1 parent cd097a5
commit 520df33
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -48,9 +48,9 @@ RUN mkdir -p \
 
 COPY --from=builder /opt/raiko/docker/entrypoint.sh ./bin/
 COPY --from=builder /opt/raiko/provers/sgx/config/sgx-guest.docker.manifest.template ./provers/sgx/config/sgx-guest.local.manifest.template
-# copy to /etc/raiko, but if self register mode, the mounted one will overwrite it.
-COPY --from=builder /opt/raiko/host/config/config.sgx.json /etc/raiko/
-COPY --from=builder /opt/raiko/host/config/chain_spec_list_default.json /etc/raiko/chain_spec_list.docker.json
+# copy to /root/.config/raiko/config/, but if self register mode, the mounted one will overwrite it.
+COPY --from=builder /opt/raiko/host/config/config.sgx.json /root/.config/raiko/config/
+COPY --from=builder /opt/raiko/host/config/chain_spec_list_default.json /root/.config/raiko/config/chain_spec_list.docker.json
 COPY --from=builder /opt/raiko/target/release/sgx-guest ./bin/
 COPY --from=builder /opt/raiko/target/release/raiko-host ./bin/
 COPY --from=builder /opt/raiko/target/release/raiko-setup ./bin/

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -33,8 +33,8 @@ function bootstrap() {
 function bootstrap_with_self_register() {
     mkdir -p "$RAIKO_DOCKER_VOLUME_SECRETS_PATH"
     cd "$RAIKO_APP_DIR"
-    echo "./$RAIKO_GUEST_SETUP_FILENAME bootstrap --l1-rpc $L1_RPC --l1-chain-id $L1_CHAIN_ID --sgx-verifier-address $SGX_VERIFIER_ADDRESS"
-    ./$RAIKO_GUEST_SETUP_FILENAME bootstrap --l1-rpc $L1_RPC --l1-chain-id $L1_CHAIN_ID --sgx-verifier-address $SGX_VERIFIER_ADDRESS
+    echo "./$RAIKO_GUEST_SETUP_FILENAME bootstrap"
+    ./$RAIKO_GUEST_SETUP_FILENAME bootstrap
     cd -
 }
 
@@ -44,11 +44,11 @@ function update_chain_spec_json() {
     KEY_NAME=$3
     UPDATE_VALUE=$4
     jq \
-    --arg update_value "$UPDATE_VALUE" \
-    --arg chain_name "$CHAIN_NAME" \
-    --arg key_name "$KEY_NAME" \
-    'map(if .name == $chain_name then .[$key_name] = $update_value else . end)' $CONFIG_FILE \
-    > /tmp/config_tmp.json && mv /tmp/config_tmp.json $CONFIG_FILE;
+        --arg update_value "$UPDATE_VALUE" \
+        --arg chain_name "$CHAIN_NAME" \
+        --arg key_name "$KEY_NAME" \
+        'map(if .name == $chain_name then .[$key_name] = $update_value else . end)' $CONFIG_FILE \
+        >/tmp/config_tmp.json && mv /tmp/config_tmp.json $CONFIG_FILE
     echo "Updated $CONFIG_FILE $CHAIN_NAME.$KEY_NAME=$UPDATE_VALUE"
 }
 
@@ -108,8 +108,8 @@ elif [[ $# -eq 1 && $1 == "--init-self-register" ]]; then
 else
     echo "start proving"
     if [[ ! -f "$RAIKO_DOCKER_VOLUME_PRIV_KEY_PATH" ]]; then
-        echo "Application was not bootstrapped. "\
-             "$RAIKO_DOCKER_VOLUME_PRIV_KEY_PATH is missing. Bootstrap it first." >&2
+        echo "Application was not bootstrapped. " \
+            "$RAIKO_DOCKER_VOLUME_PRIV_KEY_PATH is missing. Bootstrap it first." >&2
         exit 1
     fi
 

diff --git a/provers/sgx/setup/src/app_args.rs b/provers/sgx/setup/src/app_args.rs
@@ -28,7 +28,7 @@ pub struct BootstrapArgs {
     /// a proof of specified type. Curl json-rpc overrides its contents
     pub config_filename: String,
 
-    #[arg(long, default_value = "chain_spec_list_default.json")]
+    #[arg(long, default_value = "chain_spec_list.docker.json")]
     /// Path to a chain spec file that includes supported chain list
     pub chain_spec_filename: String,
 

diff --git a/script/publish-image.sh b/script/publish-image.sh
@@ -30,7 +30,7 @@ for feature in "${features[@]}"; do
 	fi
 
 	echo "Build and push $1:$tag..."
-	docker buildx build --no-cache ./ \
+	docker buildx build ./ \
 		--platform linux/amd64 \
 		-t raiko:$tag \
 		$build_flags \