fix account id for start

docker_start.sh

@@ -8,7 +8,6 @@ fi
 
 export SERVICE_TYPE="comfy"
 export CONTAINER_NAME="esd_container"
-export ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
 export AWS_REGION=$(aws configure get region)
 export COMMON_FILES_PREFIX="aws-gcr-solutions-$AWS_REGION/stable-diffusion-aws-extension-github-mainline"
 
@@ -83,7 +82,6 @@ WORKDIR /home/ubuntu/ComfyUI"
   START_HANDLER="#!/bin/bash
 set -euxo pipefail
 
-ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
 WORKFLOW_NAME=\$(cat $CONTAINER_PATH/$PROGRAM_NAME)
 
 if [ \"\$WORKFLOW_NAME\" = \"default\" ]; then
@@ -91,7 +89,7 @@ if [ \"\$WORKFLOW_NAME\" = \"default\" ]; then
 else
   BASE_IMAGE=$ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$CONTAINER_NAME:\$WORKFLOW_NAME
   aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
-  docker pull $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/esd_container:\"\$WORKFLOW_NAME\"
+  docker pull $ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/esd_container:\$WORKFLOW_NAME
 fi
 
 sudo mkdir -p $CONTAINER_PATH/output/$PROGRAM_NAME
@@ -105,12 +103,12 @@ docker stop $PROGRAM_NAME || true
 docker rm $PROGRAM_NAME || true
 docker run -v $(realpath ~/.aws):/root/.aws \\
            -v $CONTAINER_PATH:/container \\
-           -v $CONTAINER_PATH/conda:/home/ubuntu/conda \\
            -v $START_SH:/start.sh \\
            -v $COMFY_PROXY:/comfy_proxy.py:ro \\
            -v $COMFY_EXT:/ComfyUI-AWS-Extension:ro \\
            --gpus all \\
            -e IMAGE_HASH=$ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/esd_container \\
+           -e ACCOUNT_ID=$ACCOUNT_ID \\
            -e BASE_IMAGE=\$BASE_IMAGE \\
            -e SERVICE_TYPE=$SERVICE_TYPE \\
            -e ON_EC2=true \\
@@ -147,7 +145,6 @@ docker run -v $(realpath ~/.aws):/root/.aws \\
 echo "---------------------------------------------------------------------------------"
 # init default workflow for all users
 if [ ! -d "$CONTAINER_PATH/workflows/default/ComfyUI/venv" ]; then
-  bucket="aws-gcr-solutions-$AWS_REGION"
   tar_file="$CONTAINER_PATH/default.tar"
 
   if [ ! -f "$tar_file" ]; then

workshop/comfy.yaml

@@ -88,6 +88,7 @@ Resources:
           echo "DISABLE_AUTO_SYNC=false" >> /etc/environment
           echo "DISABLE_AWS_PROXY=false" >> /etc/environment
           echo "AWS_REGION=${AWS::Region}" >> /etc/environment
+          echo "ACCOUNT_ID=${AWS::AccountId}" >> /etc/environment
           echo "PROCESS_NUMBER=${NumberOfInferencePorts}" >> /etc/environment
           echo "ESD_VERSION=dev" >> /etc/environment
           echo "SERVICE_TYPE=comfy" >> /etc/environment

workshop/ec2.yaml

@@ -105,6 +105,7 @@ Resources:
           region = ${AWS::Region}" > ~/.aws/config
           
           echo "AWS_REGION=${AWS::Region}" >> /etc/environment
+          echo "ACCOUNT_ID=${AWS::AccountId}" >> /etc/environment
           echo "AWS_DEFAULT_REGION=${AWS::Region}" >> /etc/environment
           echo "ESD_EC2=true" >> /etc/environment
           echo "ESD_VERSION=dev" >> /etc/environment