Skip to content

Commit

Permalink
DP-1073 - Bump MOV-AI/.github from 1 to 2 (#149)
Browse files Browse the repository at this point in the history
* updated dal version

* updated dal version

* Update base docker pipeline version (#148)

---------

Co-authored-by: Moawiya Mograbi <mograbi.moawiya@gmail.com>
Co-authored-by: Otto Mation <92543170+OttoMation-Movai@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 28, 2023
1 parent 390a43e commit d209f1d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/DeployOnGitRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ jobs:

CI-docker-noetic:
needs: [CI-artifact-download]
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
with:
docker_file: docker/noetic/Dockerfile
docker_image: prod/backend-noetic
public: true
public_image: ce/backend-noetic
github_ref: ${{ github.ref }}
deploy: true
version: ${GITHUB_REF#refs/*/}
push_latest: true
snyk_check: true
build_args: PIP_PACKAGE_REPO=https://artifacts.cloud.mov.ai/repository/pypi-edge/simple
Expand All @@ -51,4 +49,6 @@ jobs:
registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/DeployOnMergeMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,13 @@ jobs:
CI-docker-noetic:
needs: [CI-version]
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
with:
docker_file: docker/noetic/Dockerfile
docker_image: qa/backend-noetic
public: false
public_image: ce/backend-noetic
github_ref: ${{ github.ref }}
deploy: true
version: ${{ needs.CI-version.outputs.version }}
push_latest: true
snyk_check: true
build_args: PIP_PACKAGE_REPO=https://artifacts.cloud.mov.ai/repository/pypi-integration/simple
Expand All @@ -62,4 +60,6 @@ jobs:
registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/TestOnPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,13 @@ jobs:
CI-docker-noetic:
needs: [CI-version]
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
with:
docker_file: docker/noetic/Dockerfile
docker_image: devops/backend-noetic
public: false
public_image: ce/backend-noetic
github_ref: ${{ github.ref }}
deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
version: ${{ needs.CI-version.outputs.version }}
push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
snyk_check: true
build_args: PIP_PACKAGE_REPO=https://artifacts.cloud.mov.ai/repository/pypi-experimental/simple
Expand All @@ -67,4 +65,6 @@ jobs:
registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
2 changes: 1 addition & 1 deletion docker/noetic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG DOCKER_REGISTRY="pubregistry.aws.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.2
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.3

# Arguments
ARG PIP_PACKAGE_REPO="https://artifacts.cloud.mov.ai/repository/pypi-experimental/simple"
Expand Down

0 comments on commit d209f1d

Please sign in to comment.