-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Redesign Build Deployment Process (External) #125
base: main
Are you sure you want to change the base?
Commits on Mar 18, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 6aed57a - Browse repository at this point
Copy the full SHA 6aed57aView commit details
Commits on Mar 22, 2024
-
Added docker build and push for dashboard and notebook images + Updat…
…ed viz_scripts Dockerfile viz_scripts Dockerfile contains ENV variables from docker-compose as well. Added docker image commands to image_build_push yml for dashboard and notebook images
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMar 22, 2024 Configuration menu - View commit details
-
Copy full SHA for 8b0317f - Browse repository at this point
Copy the full SHA 8b0317fView commit details -
Merge pull request #2 from MukuFlash03/image-push
Added docker commands for dashboard and notebook + Updated Dockerfile
Configuration menu - View commit details
-
Copy full SHA for 7d3cd86 - Browse repository at this point
Copy the full SHA 7d3cd86View commit details
Commits on Mar 26, 2024
-
Changed sed to jq + Renamed docker image in image_push
1. Sed to jq change to make it consistent to what is being used in internal repos. 2. Renamed image pushed to docker hub.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMar 26, 2024 Configuration menu - View commit details
-
Copy full SHA for 355db20 - Browse repository at this point
Copy the full SHA 355db20View commit details -
Merge pull request #3 from MukuFlash03/image-push
Changed sed to jq + Renamed docker image in image_push
Configuration menu - View commit details
-
Copy full SHA for 3c17d18 - Browse repository at this point
Copy the full SHA 3c17d18View commit details -
Added TODO to change image push branch
Currently the branch specified - "image-push-merge" is available locally on my system. I use it to test the automated docker image push mechanism whenever any changes are merged to this branch. Once, everything looks good, need to change this to master or main as per the repo.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMar 26, 2024 Configuration menu - View commit details
-
Copy full SHA for e402a61 - Browse repository at this point
Copy the full SHA e402a61View commit details -
Merge pull request #4 from MukuFlash03/image-push
Added TODO to change image push branch
Configuration menu - View commit details
-
Copy full SHA for ffcdbc8 - Browse repository at this point
Copy the full SHA ffcdbc8View commit details -
Removed printing Docker username
Had added it initially for testing purposes. Can remove now so it doesn't expose any sensitive info.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMar 26, 2024 Configuration menu - View commit details
-
Copy full SHA for d6a6809 - Browse repository at this point
Copy the full SHA d6a6809View commit details -
Merge pull request #5 from MukuFlash03/image-push
Removed printing Docker username
Configuration menu - View commit details
-
Copy full SHA for 102899a - Browse repository at this point
Copy the full SHA 102899aView commit details
Commits on Mar 28, 2024
-
Added cert.sh + Modified Dockerfiles
1. docker/cert.sh - Uses new environment variable PROD_STAGE variable to determine whether in staging / production environment and only then install certificates, else skip. 2. Dockerfile Added environment variables here, keeping the same default ENV values as the ones in docker-compose.yml. Not adding in docker/Dockerfile.dev, since this change is being done primarily with the objective to aid with the automated build and push to Dockerhub. This pushed image would then be the one that would be used in the internal environments as the base image, which would be based on the non-dev Dockerfile.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMar 28, 2024 Configuration menu - View commit details
-
Copy full SHA for 50a7b63 - Browse repository at this point
Copy the full SHA 50a7b63View commit details -
Merge pull request #6 from MukuFlash03/image-push
Added cert.sh + Modified Dockerfiles
Configuration menu - View commit details
-
Copy full SHA for db85f75 - Browse repository at this point
Copy the full SHA db85f75View commit details
Commits on Apr 3, 2024
-
Removing ENV variables from Dockerfile
The other ENV vars that were added in Docker-compose files are currently present in the Dockerfile in the external repo root. Removing them from there and can add them as per requirement. For local testing, add them when “docker run” is used using the -e flag. For usage in stage / production, can be set by cloud team in AWS Codebuild as they currently do. CRON_MODE CRON_MODE can be moved to setting when docker run command is executed using -e flag. This is because this is required in start_notebook.sh in CMD layer in Dockerfile which is executed when the container is run. Hence, CRON_MODE value can be supplied later and not needed to be embedded in image. PROD_STAGE Not setting PROD_TRUE in docker run command since it is required during docker image build to decide whether to add certificates or not. Hence, adding it in the Dockerfile so it’s available during docker build.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedApr 3, 2024 Configuration menu - View commit details
-
Copy full SHA for 2dab7a1 - Browse repository at this point
Copy the full SHA 2dab7a1View commit details -
Merge pull request #7 from MukuFlash03/image-push
Removing ENV variables from Dockerfile
Configuration menu - View commit details
-
Copy full SHA for 43f3d5a - Browse repository at this point
Copy the full SHA 43f3d5aView commit details
Commits on Apr 12, 2024
-
Removed sed / jq usage from start scripts
Can directly set DB_HOST since we can now use environment variables. No need to use jq or sed to replace file contents and copy over files.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedApr 12, 2024 Configuration menu - View commit details
-
Copy full SHA for 89ed59a - Browse repository at this point
Copy the full SHA 89ed59aView commit details -
Merge pull request #8 from MukuFlash03/image-push
Removed sed / jq usage from start scripts
Configuration menu - View commit details
-
Copy full SHA for 37c7599 - Browse repository at this point
Copy the full SHA 37c7599View commit details -
Changing base image to build from redesign server image
Created a new branch image-push-merge for e-mission-server in my forked repo. Also modified image push workflow to build and push docker image to docker hub on push to image-push-merge branch. Doing this since admin-dash was failing when was building from internal repo since this was still referring to old server code. Changed Dockerfile and docker/Dockerfile.dev in public-dash and admin-dash to build from this new image mukuflash03/e-mission-server:image-push-merge_2024-04-12--01-01 Redesigned server image is built from the image-push-merge branch on my personal forked repository. This branch has a workflow run set up to build the docker image and push it to Dockerhub whenever a push or merge happens to image-push-merge branch. Currently, I've been pushing to image-push and then creating a PR to merge into image-push-merge. Doing this, so admin-dash and public-dash can build from the latest redesigned server code. This is not the latest server code but the latest changes from my redesign PR.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedApr 12, 2024 Configuration menu - View commit details
-
Copy full SHA for e962d13 - Browse repository at this point
Copy the full SHA e962d13View commit details
Commits on Apr 16, 2024
-
Bumped up base server image tag
Changing to build from base server image from my personal Dockerhub repository with redesigned server code. Will need to change to build from Shankari's Dockerhub repository, once all changes are final.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedApr 16, 2024 Configuration menu - View commit details
-
Copy full SHA for 8d2464d - Browse repository at this point
Copy the full SHA 8d2464dView commit details -
Configuration menu - View commit details
-
Copy full SHA for d49a275 - Browse repository at this point
Copy the full SHA d49a275View commit details -
Merge pull request #9 from MukuFlash03/image-push
Bumped up base server image tag
Configuration menu - View commit details
-
Copy full SHA for efaf216 - Browse repository at this point
Copy the full SHA efaf216View commit details -
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committed
Apr 16, 2024 Configuration menu - View commit details
-
Copy full SHA for baac678 - Browse repository at this point
Copy the full SHA baac678View commit details -
Merge pull request #10 from MukuFlash03/image-push
Bump up base server image tag
Configuration menu - View commit details
-
Copy full SHA for 629b3a1 - Browse repository at this point
Copy the full SHA 629b3a1View commit details
Commits on Apr 26, 2024
-
Added working code from join repo to fetch docker image tags using artifact download.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedApr 26, 2024 Configuration menu - View commit details
-
Copy full SHA for fee9437 - Browse repository at this point
Copy the full SHA fee9437View commit details
Commits on Apr 30, 2024
-
Bumped up after fixing "url" KeyError bug in this commit in server repo: MukuFlash03/e-mission-server@e778b3f
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedApr 30, 2024 Configuration menu - View commit details
-
Copy full SHA for 9622279 - Browse repository at this point
Copy the full SHA 9622279View commit details
Commits on May 2, 2024
-
Added push and workflow_dispatch trigger handling to fetch appropriate docker image tags. Push trigger uses tag from artifact upload while workflow_dispatch uses tag from input parameters. Check commit from admin-dash here: MukuFlash03/op-admin-dashboard@39b289f
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 2, 2024 Configuration menu - View commit details
-
Copy full SHA for 6e3f2be - Browse repository at this point
Copy the full SHA 6e3f2beView commit details -
Updating Dockerfiles to use ARG environment variable with latest timestamp that will be passed through: - `docker build --build-arg` command in Github actions in the workflow for automated pushing to Docker hub. - `args: ` config field in docker-compose which will need to be set manually by developers locally. Also, changing branch in fetch_runID and Dockerfiles to tags-combo-approach.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 2, 2024 Configuration menu - View commit details
-
Copy full SHA for 1745634 - Browse repository at this point
Copy the full SHA 1745634View commit details -
Public-dash was failing as I had incorrectly replaced the docker build and push commands with the commands used for admin-dash in its YAML file. Public-dash has two images: frontend (dashboard) and viz_scripts (notebook-server) with their separate Dockerfiles. Hence, was getting the error: ERROR: failed to solve: failed to read dockerfile: open /var/lib/docker/tmp/buildkit-mount264844780/Dockerfile: no such file or directory https://github.com/MukuFlash03/em-public-dashboard/actions/runs/8917300905/job/24490148189
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 2, 2024 Configuration menu - View commit details
-
Copy full SHA for 21ca992 - Browse repository at this point
Copy the full SHA 21ca992View commit details -
For public-dash, admin-dash where ARGS are now being used, need to add the args under build command in the docker compose files. Gives error if arg is at the same hierarchical level as build. Also, public-dash docker-compose.yml (non-dev) version changed to have build: context, dockerfile ; unlike only build: frontend. This allows adding args under build. Similar to how currently being built in docker-compose.dev.yml. Also, args to be added under notebook-server and not dashboard since viz_scripts builds off of server image and not frontend, which is a node image.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 2, 2024 Configuration menu - View commit details
-
Copy full SHA for 58093d3 - Browse repository at this point
Copy the full SHA 58093d3View commit details
Commits on May 3, 2024
-
Adding .env file which stores only docker image timestamp for the latest dockerhub e-mission-server image already pushed. .env file overwritten in both types of trigger events - push and workflow_dispatch. Added commit and push github actions as well for pushing latest changes to the .env file made via the workflow. Lastly, docker-compose now also mentions the ENV variable name to be read from the .env file for the ARG value in the Dockerfile. No changes required in the Dockerfiles. Had to remove .env from the .gitignore file.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 3, 2024 Configuration menu - View commit details
-
Copy full SHA for 368900b - Browse repository at this point
Copy the full SHA 368900bView commit details -
Configuration menu - View commit details
-
Copy full SHA for bf3e9f7 - Browse repository at this point
Copy the full SHA bf3e9f7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6eebf87 - Browse repository at this point
Copy the full SHA 6eebf87View commit details -
Added TODOs in github actions workflow YAML file
Reminder for things to change as per master branch of e-mission-server once changes are finalized.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 3, 2024 Configuration menu - View commit details
-
Copy full SHA for e760598 - Browse repository at this point
Copy the full SHA e760598View commit details -
Previous Push event triggers run failed Error occurred in GitHub actions git add, commit, push step. If file with no changes operated upon, it leaves an error: “nothing to commit, working tree clean Error: Process completed with exit code 1.” Need to fix. —— Quick fix is to make changes to .env file only if workflow_dispatch event is the trigger. Don’t do anything for push event. So, in case anyone modifies .env file on their own by using their own timestamp during testing, and pushes it as a part of their PR, then Shankari will have to ask them to revert the changes. Else, their custom timestamp will make it to the repo code base. Found something: https://www.reddit.com/r/github/comments/ju3ipr/commit_from_github_action_only_when_changes_exist/ It should work but there’s a drawback of using “exit 0” - it will mask all errors generated during “git commit”. This is bad and we won’t be able to see the reason why something wrong happened as the workflow would be shown as successful with a green tick. Found a solution with git diff: https://github.com/simonw/til/blob/main/github-actions/commit-if-file-changed.md $ git diff --quiet || (git add README.md && git commit -m "Updated README") However, I won’t be able to log any message saying that no changes to commit, tag not modified. Hence, will possibly use just “git diff —quiet” with an if-else block. Expected results: - Push event triggers workflow. - It writes DOCKER_IMAGE_TAG_1 fetched from last successful completed run to .env file. - It sees that there is a difference in the latest committed .env file in the dashboard repo which includes older timestamp. - Hence it runs git commit part of the script to reset to latest server timestamp.
Mahadik, Mukul Chandrakant authored and Mahadik, Mukul Chandrakant committedMay 3, 2024 Configuration menu - View commit details
-
Copy full SHA for 9444e60 - Browse repository at this point
Copy the full SHA 9444e60View commit details -
Configuration menu - View commit details
-
Copy full SHA for 40beb80 - Browse repository at this point
Copy the full SHA 40beb80View commit details -
Configuration menu - View commit details
-
Copy full SHA for 29ebf49 - Browse repository at this point
Copy the full SHA 29ebf49View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d0a937 - Browse repository at this point
Copy the full SHA 1d0a937View commit details
Commits on May 6, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 308eca0 - Browse repository at this point
Copy the full SHA 308eca0View commit details
Commits on May 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 35e09cb - Browse repository at this point
Copy the full SHA 35e09cbView commit details -
Configuration menu - View commit details
-
Copy full SHA for d919a34 - Browse repository at this point
Copy the full SHA d919a34View commit details -
Preparing the yml for merge with main.
Configuration menu - View commit details
-
Copy full SHA for 11cdafb - Browse repository at this point
Copy the full SHA 11cdafbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1dda106 - Browse repository at this point
Copy the full SHA 1dda106View commit details -
Configuration menu - View commit details
-
Copy full SHA for 66bd0a6 - Browse repository at this point
Copy the full SHA 66bd0a6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 426ae50 - Browse repository at this point
Copy the full SHA 426ae50View commit details -
Merge pull request #11 from MukuFlash03/tags-combo-approach
Moving a polished version of the work from the tag automation onto the main PR for the public dash
Configuration menu - View commit details
-
Copy full SHA for 3b298fc - Browse repository at this point
Copy the full SHA 3b298fcView commit details -
Per Shankari's permission, copying the cert file every time the viz_scripts dockerfile is run instead of deciding when to copy it based on an environment variable.
Configuration menu - View commit details
-
Copy full SHA for 4335f39 - Browse repository at this point
Copy the full SHA 4335f39View commit details -
Delete viz_scripts/docker/cert.sh
Removing cert.sh per Shankari's comments
Configuration menu - View commit details
-
Copy full SHA for b330f96 - Browse repository at this point
Copy the full SHA b330f96View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9b1dca5 - Browse repository at this point
Copy the full SHA 9b1dca5View commit details
Commits on May 21, 2024
-
Configuration menu - View commit details
-
Copy full SHA for ab0e157 - Browse repository at this point
Copy the full SHA ab0e157View commit details
Commits on May 23, 2024
-
Replacing docker build in image_build_push.yml with docker compose
Removing the `docker build` command from image_build_push.yml and replacing it with `docker compose`. Since tag names cannot be specified as an input in compose, the names of the tags have to be set in the docker-compose.yml file. Additionally, these tags have to be input as environment variables ahead of the `docker compose` part of the command. I also renamed DOCKER_IMAGE_TAG to SERVER_IMAGE_TAG, since this is a more meaningful name. I will implement this change across the other repositories that use this variable name.
Configuration menu - View commit details
-
Copy full SHA for 7c78c18 - Browse repository at this point
Copy the full SHA 7c78c18View commit details -
Configuration menu - View commit details
-
Copy full SHA for 27c2f42 - Browse repository at this point
Copy the full SHA 27c2f42View commit details -
Remove whitespace changes to docker-compose.dev.yml
Removing unnecessary whitespace changes.
Configuration menu - View commit details
-
Copy full SHA for c8b6dca - Browse repository at this point
Copy the full SHA c8b6dcaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 40bf355 - Browse repository at this point
Copy the full SHA 40bf355View commit details -
Configuration menu - View commit details
-
Copy full SHA for 803e9c2 - Browse repository at this point
Copy the full SHA 803e9c2View commit details
Commits on May 24, 2024
-
Adding a step to upload an artifact with the newly created image tag. This way, the file can be pulled into the internal repo with GH API.
Configuration menu - View commit details
-
Copy full SHA for 7ee8e61 - Browse repository at this point
Copy the full SHA 7ee8e61View commit details -
Removing DB_HOST fallback in start_notebook.sh
Fallback unnecessary
Configuration menu - View commit details
-
Copy full SHA for af3c2d3 - Browse repository at this point
Copy the full SHA af3c2d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91d5251 - Browse repository at this point
Copy the full SHA 91d5251View commit details
Commits on May 26, 2024
-
I want to see if passing in the tags to the docker-compose in the way I'm trying to will actually work. We'll see!
Configuration menu - View commit details
-
Copy full SHA for d3bf89f - Browse repository at this point
Copy the full SHA d3bf89fView commit details -
Configuration menu - View commit details
-
Copy full SHA for c58b5dd - Browse repository at this point
Copy the full SHA c58b5ddView commit details -
Configuration menu - View commit details
-
Copy full SHA for 14775b5 - Browse repository at this point
Copy the full SHA 14775b5View commit details -
Configuration menu - View commit details
-
Copy full SHA for f595b0d - Browse repository at this point
Copy the full SHA f595b0dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f17e5d - Browse repository at this point
Copy the full SHA 2f17e5dView commit details -
Reverting changes made to test
Reverting the changes that I made to test the workflow with docker compose.
Configuration menu - View commit details
-
Copy full SHA for 25dcba1 - Browse repository at this point
Copy the full SHA 25dcba1View commit details
Commits on May 28, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 82cf4e9 - Browse repository at this point
Copy the full SHA 82cf4e9View commit details