From e12a424ab44c2a209762451c5a986395926712a8 Mon Sep 17 00:00:00 2001 From: Vasilije <8619304+Vasilije1990@users.noreply.github.com> Date: Fri, 25 Aug 2023 20:48:16 +0200 Subject: [PATCH] added fix --- .github/workflows/cd.yaml | 32 +++++++++++++++---------------- .github/workflows/cd_prd.yaml | 32 +++++++++++++++---------------- level_2/bin/dockerize | 36 ----------------------------------- 3 files changed, 32 insertions(+), 68 deletions(-) delete mode 100755 level_2/bin/dockerize diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 53dc50179..e03a3bd45 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -58,19 +58,19 @@ jobs: outputs: promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }} - apply_tf: - name: Trigger terraform apply workflow - runs-on: ubuntu-latest - needs: publish_docker_to_ecr - steps: - - name: TF apply workflow triggers step - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} - script: | - await github.rest.actions.createWorkflowDispatch({ - owner: 'topoteretes', - repo: 'PromethAI-Infra', - workflow_id: 'terraform.apply.yml', - ref: 'main' - }) +# apply_tf: +# name: Trigger terraform apply workflow +# runs-on: ubuntu-latest +# needs: publish_docker_to_ecr +# steps: +# - name: TF apply workflow triggers step +# uses: actions/github-script@v6 +# with: +# github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} +# script: | +# await github.rest.actions.createWorkflowDispatch({ +# owner: 'topoteretes', +# repo: 'PromethAI-Infra', +# workflow_id: 'terraform.apply.yml', +# ref: 'main' +# }) diff --git a/.github/workflows/cd_prd.yaml b/.github/workflows/cd_prd.yaml index 8c501374c..97b943ad2 100644 --- a/.github/workflows/cd_prd.yaml +++ b/.github/workflows/cd_prd.yaml @@ -81,19 +81,19 @@ jobs: outputs: promethai_docker_tag_backend: ${{ steps.export-promethai-docker-tag.outputs.promethai_docker_tag_backend }} - apply_tf: - name: Trigger terraform apply workflow - runs-on: ubuntu-latest - needs: publish_docker_to_ecr - steps: - - name: TF apply workflow triggers step - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} - script: | - await github.rest.actions.createWorkflowDispatch({ - owner: 'topoteretes', - repo: 'PromethAI-Infra', - workflow_id: 'terraform.apply.yml', - ref: 'main' - }) +# apply_tf: +# name: Trigger terraform apply workflow +# runs-on: ubuntu-latest +# needs: publish_docker_to_ecr +# steps: +# - name: TF apply workflow triggers step +# uses: actions/github-script@v6 +# with: +# github-token: ${{ secrets.PAT_FOR_CROSS_REPOS_CICD_TRIGGERING }} +# script: | +# await github.rest.actions.createWorkflowDispatch({ +# owner: 'topoteretes', +# repo: 'PromethAI-Infra', +# workflow_id: 'terraform.apply.yml', +# ref: 'main' +# }) diff --git a/level_2/bin/dockerize b/level_2/bin/dockerize deleted file mode 100755 index e1f146bad..000000000 --- a/level_2/bin/dockerize +++ /dev/null @@ -1,36 +0,0 @@ -set -euo pipefail - -AWS_REGION=${region:-eu-west-1} -AWS_DEPLOYMENT_ACCOUNT=${account:-463722570299} -AWS_REPOSITORY=${repo:-"${AWS_DEPLOYMENT_ACCOUNT}.dkr.ecr.${AWS_REGION}.amazonaws.com"} - -STAGE=${stage:-"dev"} -SHA_SHORT="$(git rev-parse --short HEAD)" -CUR_DATE="$(date +%Y%m%d%H%M%S)" -VERSION="$STAGE-$CUR_DATE-$SHA_SHORT" -IMAGE_NAME=${image_name:-promethai-${STAGE}-promethai-backend-memory} - -REPO_NAME="${AWS_REPOSITORY}/${IMAGE_NAME}" -FULL_IMAGE_NAME="${REPO_NAME}:${VERSION}" -APP_DIR=${app_dir:-"."} - -PUBLISH=${publish:-false} - -echo "Building docker image ${FULL_IMAGE_NAME} located in dir ${app_dir}" - -pushd "${APP_DIR}" && - docker buildx build --platform linux/amd64 \ - --build-arg STAGE=${STAGE} \ - -t "${FULL_IMAGE_NAME}" . && - echo "${VERSION}" >/tmp/.DOCKER_IMAGE_VERSION && - echo "Successfully built docker image ${FULL_IMAGE_NAME}" - -if [ "${PUBLISH}" = true ]; then - echo "Pushing docker image ${FULL_IMAGE_NAME} to ECR repository to AWS account ${AWS_DEPLOYMENT_ACCOUNT}" - if [ "${PUBLISH}" = true ]; then - echo "logging in" - aws ecr get-login-password --region "${AWS_REGION}" | docker login --username AWS --password-stdin "${AWS_REPOSITORY}" - fi - docker push "${FULL_IMAGE_NAME}" && - echo "Successfully pushed docker image ${FULL_IMAGE_NAME} to ECR repository" -fi \ No newline at end of file