Skip to content

Commit

Permalink
Release 0.1.40 (#179)
Browse files Browse the repository at this point in the history
* Add Python version env var for GitLab

* Update gitlab deploy.py

* Add comments

* Update comments

* Update comments

* Update base image in Dockerfile

* Update base image in Dockerfile

* Update base image in Dockerfile

* Update base image in Dockerfile

* Update  Dockerfile

* Update  Dockerfile

* Update Dockerfile

* Update Dockerfile

* Rebuild

* Update Dockerfile
  • Loading branch information
maximearmstrong authored May 28, 2024
1 parent 2de6020 commit 2206ffe
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 26 deletions.
2 changes: 1 addition & 1 deletion actions/utils/copy_template/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.39"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.40"
entrypoint: "/copy_template.sh"
2 changes: 1 addition & 1 deletion actions/utils/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.39"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.40"
entrypoint: "/deploy.sh"
args:
- ${{ inputs.pr }}
2 changes: 1 addition & 1 deletion actions/utils/get_branch_deployment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ outputs:
description: "The Cloud deployment associated with this branch."
runs:
using: "docker"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.39"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.40"
entrypoint: "/get_branch_deployment.sh"
2 changes: 1 addition & 1 deletion actions/utils/notify/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ inputs:

runs:
using: "docker"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.39"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.40"
entrypoint: "/notify.sh"
args:
- ${{ inputs.pr }}
2 changes: 1 addition & 1 deletion actions/utils/registry_info/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.39"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.40"
entrypoint: "/registry_info.sh"
2 changes: 1 addition & 1 deletion actions/utils/run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ outputs:
description: "The ID of the launched run."
runs:
using: "docker"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.39"
image: "docker://ghcr.io/dagster-io/dagster-cloud-action:0.1.40"
entrypoint: "/run.sh"
args:
- ${{ inputs.pr }}
Binary file modified generated/gha/dagster-cloud.pex
Binary file not shown.
6 changes: 3 additions & 3 deletions gitlab/dbt/serverless-ci-dbt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ deploy-branch:
stage: deploy
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
# first create the branch deployment
- export PR_TIMESTAMP=$(git log -1 --format='%cd' --date=unix)
Expand Down Expand Up @@ -51,7 +51,7 @@ deploy-branch:

close_branch:
stage: deploy
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
when: manual
only:
- merge_requests
Expand All @@ -76,7 +76,7 @@ deploy:
stage: deploy
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
# install dbt package
- pip install pip --upgrade
Expand Down
8 changes: 4 additions & 4 deletions gitlab/hybrid-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ workflow:

initialize:
stage: setup
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- export
- dagster-cloud ci check --project-dir=$DAGSTER_PROJECT_DIR --dagster-cloud-yaml-path=$DAGSTER_CLOUD_YAML_PATH
Expand Down Expand Up @@ -75,7 +75,7 @@ deploy-docker:
dependencies:
- build-image
- initialize
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- dagster-cloud ci set-build-output --image-tag=$IMAGE_TAG
- dagster-cloud ci deploy
Expand All @@ -87,7 +87,7 @@ deploy-docker-branch:
dependencies:
- build-image
- initialize
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- dagster-cloud ci set-build-output --image-tag=$IMAGE_TAG
- dagster-cloud ci deploy
Expand All @@ -97,7 +97,7 @@ deploy-docker-branch:

close-branch:
stage: deploy
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
when: manual
only:
- merge_requests
Expand Down
6 changes: 3 additions & 3 deletions gitlab/serverless-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ deploy-branch:
stage: deploy
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
# first create the branch deployment
- export PR_TIMESTAMP=$(git log -1 --format='%cd' --date=unix)
Expand Down Expand Up @@ -37,7 +37,7 @@ deploy-branch:

close_branch:
stage: deploy
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
when: manual
only:
- merge_requests
Expand All @@ -62,6 +62,6 @@ deploy:
stage: deploy
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- /gitlab_action/deploy.py ./dagster_cloud.yaml
10 changes: 5 additions & 5 deletions gitlab/serverless-legacy-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ workflow:

parse-workspace:
stage: setup
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- python /gitlab_action/parse_workspace.py dagster_cloud.yaml >> build.env
- cp /Dockerfile.template .
Expand All @@ -23,7 +23,7 @@ parse-workspace:

fetch-registry-info:
stage: setup
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script: dagster-cloud serverless registry-info --url $DAGSTER_CLOUD_URL/prod --api-token $DAGSTER_CLOUD_API_TOKEN | grep '=' >> registry.env
artifacts:
reports:
Expand Down Expand Up @@ -53,7 +53,7 @@ deploy-docker:
- build-image
- parse-workspace
- fetch-registry-info
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- dagster-cloud workspace add-location
--url $DAGSTER_CLOUD_URL/prod
Expand All @@ -74,7 +74,7 @@ deploy-docker-branch:
- build-image
- parse-workspace
- fetch-registry-info
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
script:
- export PR_TIMESTAMP=$(git log -1 --format='%cd' --date=unix)
- export PR_MESSAGE=$(git log -1 --format='%s')
Expand Down Expand Up @@ -109,7 +109,7 @@ deploy-docker-branch:

close_branch:
stage: deploy
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.39
image: ghcr.io/dagster-io/dagster-cloud-action:0.1.40
when: manual
only:
- merge_requests
Expand Down
20 changes: 15 additions & 5 deletions src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
FROM --platform=linux/amd64 python:3.8.16-slim
# Use an official manylinux builder (https://github.com/pypa/manylinux#docker-images)
FROM --platform=linux/amd64 quay.io/pypa/manylinux2014_x86_64:latest

# Install deps
RUN apt update && apt install git -y
RUN pip install pex
RUN yum update && yum install -y git
RUN /opt/python/cp38-cp38/bin/python -m pip install pex

RUN /opt/python/cp38-cp38/bin/python -m pip install dagster-cloud-cli
RUN /opt/python/cp39-cp39/bin/python -m pip install dagster-cloud-cli
RUN /opt/python/cp310-cp310/bin/python -m pip install dagster-cloud-cli
RUN /opt/python/cp311-cp311/bin/python -m pip install dagster-cloud-cli

# Create virtual environment using PEX
COPY generated/gha/dagster-cloud.pex /dagster-cloud.pex
RUN pex-tools dagster-cloud.pex venv /venv-dagster-cloud
ENV PATH="/venv-dagster-cloud/bin:$PATH"
RUN PEX_TOOLS=1 /opt/python/cp38-cp38/bin/python /dagster-cloud.pex venv /venv-dagster-cloud

# Add all the relevant Python binaries to the PATH
ENV PATH="/venv-dagster-cloud/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:/opt/python/cp312-cp312/bin:$PATH"


# Copy all src scripts

Expand Down

0 comments on commit 2206ffe

Please sign in to comment.