diff --git a/README.md b/README.md index 08b6b7b16..a8c82da9b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A self-hosted chat app for small teams or big Gal by [Security Compass][seccom]. [![Build Status](https://travis-ci.org/sdelements/lets-chat.svg?branch=master)](https://travis-ci.org/sdelements/lets-chat) [![Dependency Status](https://david-dm.org/sdelements/lets-chat.svg)](https://david-dm.org/sdelements/lets-chat) [![devDependency Status](https://david-dm.org/sdelements/lets-chat/dev-status.svg)](https://david-dm.org/sdelements/lets-chat#info=devDependencies) - +a ## Features and Stuff diff --git a/codefresh.yml b/codefresh.yml index 982009f1b..4d200e9b7 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -1,48 +1,13 @@ version: '1.0' steps: + + launch_latest_full_composition: + title: "Launch full composition with latest images (develop)" + type: launch-composition + composition: docker-compose.yml + environment_name: "demo" + composition_variables: + - VALUE=myvalue - build_step: - title: Build - type: build - dockerfile: Dockerfile - image_name: containers101/demochat - tag: ${{CF_BRANCH}} - unit_tests: - title: Unit Tests - image: ${{build_step}} - fail_fast: false - #working-directory : ${{initial-clone}} - commands: - #- npm install - #- npm install -g gulp - - npm test - push_to_registry: - title: Push To Registry - type: push - candidate: ${{build_step}} - tag: ${{CF_BRANCH}} - - #demo-chat-integration: - # type: composition - # composition: letschat - # composition-candidates: - # main: - # image: nhoag/curl - # command: bash -c "sleep 20 && curl http://demochat:5000/" | echo 'works' - - deploy_to_ecs: - title: Deploy Container to ECS - image: codefresh/cf-deploy-ecs - commands: - - cfecs-update --image-name containers101/demochat --image-tag ${{CF_BRANCH}} eu-west-1 demochat-production demochat-service - environment: - - AWS_ACCESS_KEY_ID=AKIAISRGV2FLUTSZJPVQ - #${{AWS_ACCESS_KEY_ID}} - - AWS_SECRET_ACCESS_KEY=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 - #${{AWS_SECRET_ACCESS_KEY}} - when: - branch: - only: - - master diff --git a/docker-compose.yml b/docker-compose.yml index 2e646c5aa..e7ebde9f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,11 @@ version: '2' services: web: - build: . + image: 'codefreshio/demochat:composetest' ports: - - 5000:5000 + - 5000 + environment: + - KEY:${VALUE} mongo: image: mongo