Skip to content

Commit

Permalink
Merge branch 'cicd-cleanup' into cleanup-cicd
Browse files Browse the repository at this point in the history
  • Loading branch information
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committed Sep 27, 2024
2 parents bb4fe5d + d799254 commit c11c58f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 32 deletions.
36 changes: 6 additions & 30 deletions .github/workflows/image_build_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -72,14 +72,14 @@ jobs:
run: |
echo "PUBLIC_DASH_NOTEBOOK_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.date.outputs.date }}" > .env
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
echo "Workflow_dispatch: Reuse existing frontend image tag"
echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }}" >> .env
echo "Workflow_dispatch: Reuse existing frontend image tag"
echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }}" >> .env
else
echo "Push event: Update frontend image tag"
echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.date.outputs.date }}" >> .env
echo "Push event: Update frontend image tag"
echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.date.outputs.date }}" >> .env
fi
echo "SERVER_IMAGE_TAG=${{ steps.get-server-tag.outputs.SERVER_IMAGE_TAG }}" >> .env
- name: Add, Commit, Push changes to .env file
run: |
git config --local user.email "[email protected]"
Expand All @@ -91,27 +91,3 @@ jobs:
git commit -m "Updated docker image tags in .env file to the latest timestamp"
git push origin
fi
- name: Create artifact text files
run: |
if [ "${{ github.event_name }}" == "push" ]; then
echo ${{ steps.date.outputs.date }} > frontend_tag_file.txt
else
echo ${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }} | cut -d'_' -f2 > frontend_tag_file.txt
fi
echo ${{ steps.date.outputs.date }} > notebook_tag_file.txt
echo "Created tag text files"
- name: Upload Frontend Tag Artifact
uses: actions/upload-artifact@v4
with:
name: frontend-image-tag
path: frontend_tag_file.txt
overwrite: true

- name: Upload Notebook Tag Artifact
uses: actions/upload-artifact@v4
with:
name: notebook-image-tag
path: notebook_tag_file.txt
overwrite: true
3 changes: 1 addition & 2 deletions viz_scripts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# python 3
ARG SERVER_IMAGE_TAG

# FROM shankari/e-mission-server:${SERVER_IMAGE_TAG}
FROM mukuflash03/e-mission-server:${SERVER_IMAGE_TAG}

ADD https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem /etc/ssl/certs/

VOLUME /plots

ADD docker/environment36.dashboard.additions.yml /
Expand Down

0 comments on commit c11c58f

Please sign in to comment.