diff --git a/.github/workflows/serverless_deploy.yml b/.github/workflows/serverless_deploy.yml index 0ff0261f..61641e37 100644 --- a/.github/workflows/serverless_deploy.yml +++ b/.github/workflows/serverless_deploy.yml @@ -3,6 +3,7 @@ on: push: branches: - "main" + - "env-vars-first" env: DAGSTER_CLOUD_URL: ${{ secrets.DAGSTER_CLOUD_SERVERLESS_URL }} DAGSTER_CLOUD_API_TOKEN: ${{ secrets.DAGSTER_CLOUD_SERVERLESS_API_TOKEN }} diff --git a/actions/serverless_prod_deploy/action.yml b/actions/serverless_prod_deploy/action.yml index 587d6693..80db5766 100644 --- a/actions/serverless_prod_deploy/action.yml +++ b/actions/serverless_prod_deploy/action.yml @@ -65,6 +65,14 @@ runs: env_vars: ${{ inputs.env_vars }} base_image: ${{ inputs.base_image }} + - name: Print out env var inputs + run: echo "${{ inputs.env_vars }}" + shell: bash + + - name: Print out Dockerfile + run: cat ${{ fromJson(inputs.location).directory }}/Dockerfile + shell: bash + - name: Build and push Docker image uses: docker/build-push-action@v3 with: diff --git a/actions/utils/copy_template/action.yml b/actions/utils/copy_template/action.yml index d5eb79e8..f51fea76 100644 --- a/actions/utils/copy_template/action.yml +++ b/actions/utils/copy_template/action.yml @@ -12,5 +12,5 @@ inputs: description: "A string of the base image name for the deployed code location image." runs: using: "docker" - image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.6" + image: "docker://ghcr.io/dagster-io/dagster-cloud-action:env-vars-first" entrypoint: "/copy_template.sh" diff --git a/actions/utils/deploy/action.yml b/actions/utils/deploy/action.yml index 657614ed..20011882 100644 --- a/actions/utils/deploy/action.yml +++ b/actions/utils/deploy/action.yml @@ -39,7 +39,7 @@ outputs: description: "The Cloud deployment associated with this branch." runs: using: "docker" - image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.6" + image: "docker://ghcr.io/dagster-io/dagster-cloud-action:env-vars-first" entrypoint: "/deploy.sh" args: - ${{ inputs.pr }} diff --git a/actions/utils/notify/action.yml b/actions/utils/notify/action.yml index 3eb20d65..5af99746 100644 --- a/actions/utils/notify/action.yml +++ b/actions/utils/notify/action.yml @@ -30,7 +30,7 @@ inputs: runs: using: "docker" - image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.6" + image: "docker://ghcr.io/dagster-io/dagster-cloud-action:env-vars-first" entrypoint: "/notify.sh" args: - ${{ inputs.pr }} diff --git a/actions/utils/registry_info/action.yml b/actions/utils/registry_info/action.yml index db15284e..20730abc 100644 --- a/actions/utils/registry_info/action.yml +++ b/actions/utils/registry_info/action.yml @@ -12,5 +12,5 @@ inputs: description: "Alternative to providing organization ID. The URL of your Dagster Cloud organization." runs: using: "docker" - image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.6" + image: "docker://ghcr.io/dagster-io/dagster-cloud-action:env-vars-first" entrypoint: "/registry_info.sh" diff --git a/actions/utils/run/action.yml b/actions/utils/run/action.yml index f43e417b..0fde9210 100644 --- a/actions/utils/run/action.yml +++ b/actions/utils/run/action.yml @@ -39,7 +39,7 @@ outputs: description: "The ID of the launched run." runs: using: "docker" - image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.6" + image: "docker://ghcr.io/dagster-io/dagster-cloud-action:env-vars-first" entrypoint: "/run.sh" args: - ${{ inputs.pr }} diff --git a/src/copy_template.sh b/src/copy_template.sh index 047ed32c..e8583bd5 100755 --- a/src/copy_template.sh +++ b/src/copy_template.sh @@ -10,5 +10,5 @@ else fi -cat /Dockerfile.template >> ${INPUT_TARGET_DIRECTORY}/Dockerfile cat $(python /expand_env_vars.py) >> ${INPUT_TARGET_DIRECTORY}/Dockerfile +cat /Dockerfile.template >> ${INPUT_TARGET_DIRECTORY}/Dockerfile