diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..94a25f7f4c --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 331e505b1d..233734d985 100644 --- a/README.md +++ b/README.md @@ -21,40 +21,39 @@ Architecture * A Postgres database backed by a Docker volume * A Node.js webapp which shows the results of the voting in real time +####*Add repository using composition wizard:* +

+ +

-Getting started ---------------- -####*Perquisites:* -1. Fork this repository. -2. Add this repository to your Codefresh account. -3. Set your Docker registry (Docker Hub, GCR etc.) in your account admin. This is in case you want to push. +1. Go to The Compositions tab +![Service settings](images/codefresh_composition_first_screen.png) -(If you don't want to set the credentials in the admin or want to use a different credentials see example `push.with.credentials.yml` in the `vote` folder.) +2. Click on the button ADD COMPOSITION. -####*Build and Push each service separately:* +3. Enter the name of composition and click NEXT +![Service settings](images/codefresh_name_composition.png) -1. Go to The Service settings -![Service settings](images/settings.png) -2. Create 3 services: *vote*, *result* and *worker*. -3. Set each service's `Use YML build` property to `ON`. Optional: set `Add webhooks` to on. This will trigger build on every commit. -4. Set the YML location to `./vote/codefresh.build.and.push.yml` for the `vote` service. Do the same for each one of the other services, and just change the `vote` to `result` or `worker`. -![Pipelines settings](images/pipelines.png) -5. You can now press Build for each one of the pipelines that you want. Just select which one on the dropdown. -![Pipelines settings](images/buildbutton.png) -![Pipelines settings](images/builddialog.png) - - -####*Build and Push all the services:* -If you want to create on build for all the services you can just add one service with a yaml that will build all of them. +4. Add your docker-compose.yml from file and click NEXT +![Service settings](images/codefresh_compose_from_file.png) -1. Go to The Service settings -![Service settings](images/settings.png) -2. Create only one service -3. Set service's `Use YML build` property to `ON`. -4. Set the YML location to `./codefresh.yml`. -5. You can now press Build and build your service. -![Service settings](images/buildfull.png) +5. Specify the link to the repository, choose the branch 'start_from_compose' and click NEXT +![Service settings](images/codefresh_select_repo.png) +6. Specify the path to docker-compose.yml and click NEXT +![Pipelines settings](images/codefresh_docker_compose.png) +7. Review your docker-compose.yml and click CONTINUE +![Pipelines settings](images/codefresh_review_docker_compose.png) + +8. See the composition that will be created based on your file. It will parser your file and create a pipeline +in case we detected warnings you can fix them later in the compositoin view +![Pipelines settings](images/codefresh_compose_file.png) + +9. Then you can choose BUILD IMAGES or go to COMPOSITION CONFIGURATION +![Pipelines settings](images/codefresh_build_images.png) + +10. In composition view you will see it and will be able to fix the warnings/errors +![Pipelines settings](images/codefresh_compose_editor.png) \ No newline at end of file diff --git a/images/codefresh_build_images.png b/images/codefresh_build_images.png new file mode 100644 index 0000000000..0c3be8ee97 Binary files /dev/null and b/images/codefresh_build_images.png differ diff --git a/images/codefresh_compose_editor.png b/images/codefresh_compose_editor.png new file mode 100644 index 0000000000..2f2dcdd6ad Binary files /dev/null and b/images/codefresh_compose_editor.png differ diff --git a/images/codefresh_compose_file.png b/images/codefresh_compose_file.png new file mode 100644 index 0000000000..a1d9332704 Binary files /dev/null and b/images/codefresh_compose_file.png differ diff --git a/images/codefresh_compose_from_file.png b/images/codefresh_compose_from_file.png new file mode 100644 index 0000000000..a6985f7fc1 Binary files /dev/null and b/images/codefresh_compose_from_file.png differ diff --git a/images/codefresh_composition_first_screen.png b/images/codefresh_composition_first_screen.png new file mode 100644 index 0000000000..97cd9c42ba Binary files /dev/null and b/images/codefresh_composition_first_screen.png differ diff --git a/images/codefresh_docker_compose.png b/images/codefresh_docker_compose.png new file mode 100644 index 0000000000..89aacb69a5 Binary files /dev/null and b/images/codefresh_docker_compose.png differ diff --git a/images/codefresh_name_composition.png b/images/codefresh_name_composition.png new file mode 100644 index 0000000000..c50d76235a Binary files /dev/null and b/images/codefresh_name_composition.png differ diff --git a/images/codefresh_review_docker_compose.png b/images/codefresh_review_docker_compose.png new file mode 100644 index 0000000000..f7d9635705 Binary files /dev/null and b/images/codefresh_review_docker_compose.png differ diff --git a/images/codefresh_select_repo.png b/images/codefresh_select_repo.png new file mode 100644 index 0000000000..2d3d38fa9d Binary files /dev/null and b/images/codefresh_select_repo.png differ diff --git a/images/docker-compose.gif b/images/docker-compose.gif new file mode 100644 index 0000000000..2c65f4a166 Binary files /dev/null and b/images/docker-compose.gif differ