From 8ef0f9b300be8a956c4b983456980dcf5d922a25 Mon Sep 17 00:00:00 2001 From: Erik Osterman Date: Thu, 2 Jul 2020 18:38:24 -0700 Subject: [PATCH] rebuild readme and add github action (#13) --- .github/workflows/docker.yml | 25 +++++++ Dockerfile | 6 +- Makefile | 16 +--- README.md | 137 +++++++++++------------------------ codefresh.yml | 109 ---------------------------- docs/targets.md | 4 - 6 files changed, 72 insertions(+), 225 deletions(-) create mode 100644 .github/workflows/docker.yml delete mode 100644 codefresh.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..4482f84 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,25 @@ +name: "docker" +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] + release: + types: + - created +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: "Checkout source code at current commit" + uses: actions/checkout@v2 + - name: "Build and push docker image to DockerHub" + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + repository: ${{ github.repository }} + registry: registry-1.docker.io + tag_with_ref: true + tag_with_sha: true diff --git a/Dockerfile b/Dockerfile index 6f38b7b..bc7c7c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,7 @@ -FROM scratch +FROM cloudposse/build-harness:0.37.0 + +RUN apk add go terraform_0.11@cloudposse terraform_0.12@cloudposse + COPY test/ /test/ + WORKDIR / diff --git a/Makefile b/Makefile index 95e6cfd..e56358d 100644 --- a/Makefile +++ b/Makefile @@ -4,26 +4,12 @@ export DOCKER_TAG ?= latest export DOCKER_IMAGE_NAME ?= $(DOCKER_IMAGE):$(DOCKER_TAG) export DOCKER_BUILD_FLAGS = export README_DEPS ?= docs/targets.md -export INSTALL_PATH ?= /usr/local/bin -include $(shell curl -sSL -o .build-harness "https://git.io/build-harness"; echo .build-harness) -## Initialize test-harness, install deps, build docker container, install wrapper script and run shell -all: init deps build install run - @exit 0 - -## Install dependencies (if any) -deps: - @exit 0 +.DEFAULT_GOAL : build ## Build docker image build: @make --no-print-directory docker/build -## Push docker image to registry -push: - docker push $(DOCKER_IMAGE) - -## Install wrapper script from geodesic container -install: - @docker run --rm $(DOCKER_IMAGE_NAME) | sudo -E bash -s $(DOCKER_TAG) diff --git a/README.md b/README.md index 157f44a..dbce4a5 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,4 @@ - + [![README Header][readme_header_img]][readme_header_link] [![Cloud Posse][logo]](https://cpco.io/homepage) @@ -105,14 +66,10 @@ COPY --from=test-harness /tests/ /tests/ ``` Available targets: - all Initialize test-harness, install deps, build docker container, install wrapper script and run shell build Build docker image - deps Install dependencies (if any) help Help screen help/all Display help for all targets help/short This help short screen - install Install wrapper script from geodesic container - push Push docker image to registry ``` @@ -128,51 +85,38 @@ For additional context, refer to some of these links. ## Help -**Got a question?** We got answers. +**Got a question?** File a GitHub [issue](https://github.com/cloudposse/test-harness/issues), send us an [email][email] or join our [Slack Community][slack]. [![README Commercial Support][readme_commercial_support_img]][readme_commercial_support_link] -## DevOps Accelerator for Startups +## Commercial Support + +Work directly with our team of DevOps experts via email, slack, and video conferencing. +We provide [*commercial support*][commercial_support] for all of our [Open Source][github] projects. As a *Dedicated Support* customer, you have access to our team of subject matter experts at a fraction of the cost of a full-time engineer. -We are a [**DevOps Accelerator**][commercial_support]. We'll help you build your cloud infrastructure from the ground up so you can own it. Then we'll show you how to operate it and stick around for as long as you need us. +[![E-Mail](https://img.shields.io/badge/email-hello@cloudposse.com-blue.svg)][email] -[![Learn More](https://img.shields.io/badge/learn%20more-success.svg?style=for-the-badge)][commercial_support] +- **Questions.** We'll use a Shared Slack channel between your team and ours. +- **Troubleshooting.** We'll help you triage why things aren't working. +- **Code Reviews.** We'll review your Pull Requests and provide constructive feedback. +- **Bug Fixes.** We'll rapidly work to fix any bugs in our projects. +- **Build New Terraform Modules.** We'll [develop original modules][module_development] to provision infrastructure. +- **Cloud Architecture.** We'll assist with your cloud strategy and design. +- **Implementation.** We'll provide hands-on support to implement our reference architectures. -Work directly with our team of DevOps experts via email, slack, and video conferencing. -We deliver 10x the value for a fraction of the cost of a full-time engineer. Our track record is not even funny. If you want things done right and you need it done FAST, then we're your best bet. -- **Reference Architecture.** You'll get everything you need from the ground up built using 100% infrastructure as code. -- **Release Engineering.** You'll have end-to-end CI/CD with unlimited staging environments. -- **Site Reliability Engineering.** You'll have total visibility into your apps and microservices. -- **Security Baseline.** You'll have built-in governance with accountability and audit logs for all changes. -- **GitOps.** You'll be able to operate your infrastructure via Pull Requests. -- **Training.** You'll receive hands-on training so your team can operate what we build. -- **Questions.** You'll have a direct line of communication between our teams via a Shared Slack channel. -- **Troubleshooting.** You'll get help to triage when things aren't working. -- **Code Reviews.** You'll receive constructive feedback on Pull Requests. -- **Bug Fixes.** We'll rapidly work with you to fix any bugs in our projects. ## Slack Community Join our [Open Source Community][slack] on Slack. It's **FREE** for everyone! Our "SweetOps" community is where you get to talk with others who share a similar vision for how to rollout and manage infrastructure. This is the best place to talk shop, ask questions, solicit feedback, and work together as a community to build totally *sweet* infrastructure. -## Discourse Forums - -Participate in our [Discourse Forums][discourse]. Here you'll find answers to commonly asked questions. Most questions will be related to the enormous number of projects we support on our GitHub. Come here to collaborate on answers, find solutions, and get ideas about the products and services we value. It only takes a minute to get started! Just sign in with SSO using your GitHub account. - ## Newsletter -Sign up for [our newsletter][newsletter] that covers everything on our technology radar. Receive updates on what we're up to on GitHub as well as awesome new projects we discover. - -## Office Hours - -[Join us every Wednesday via Zoom][office_hours] for our weekly "Lunch & Learn" sessions. It's **FREE** for everyone! - -[![zoom](https://img.cloudposse.com/fit-in/200x200/https://cloudposse.com/wp-content/uploads/2019/08/Powered-by-Zoom.png")][office_hours] +Signup for [our newsletter][newsletter] that covers everything on our technology radar. Receive updates on what we're up to on GitHub as well as awesome new projects we discover. ## Contributing @@ -256,38 +200,39 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply |---|---|---| [osterman_homepage]: https://github.com/osterman - [osterman_avatar]: https://img.cloudposse.com/150x150/https://github.com/osterman.png + [osterman_avatar]: https://github.com/osterman.png?size=150 [aknysh_homepage]: https://github.com/aknysh - [aknysh_avatar]: https://img.cloudposse.com/150x150/https://github.com/aknysh.png + [aknysh_avatar]: https://github.com/aknysh.png?size=150 [goruha_homepage]: https://github.com/goruha - [goruha_avatar]: https://img.cloudposse.com/150x150/https://github.com/goruha.png + [goruha_avatar]: https://github.com/goruha.png?size=150 + + [![README Footer][readme_footer_img]][readme_footer_link] [![Beacon][beacon]][website] [logo]: https://cloudposse.com/logo-300x69.svg - [docs]: https://cpco.io/docs?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=docs - [website]: https://cpco.io/homepage?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=website - [github]: https://cpco.io/github?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=github - [jobs]: https://cpco.io/jobs?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=jobs - [hire]: https://cpco.io/hire?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=hire - [slack]: https://cpco.io/slack?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=slack - [linkedin]: https://cpco.io/linkedin?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=linkedin - [twitter]: https://cpco.io/twitter?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=twitter - [testimonial]: https://cpco.io/leave-testimonial?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=testimonial - [office_hours]: https://cloudposse.com/office-hours?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=office_hours - [newsletter]: https://cpco.io/newsletter?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=newsletter - [discourse]: https://ask.sweetops.com/?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=discourse - [email]: https://cpco.io/email?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=email - [commercial_support]: https://cpco.io/commercial-support?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=commercial_support - [we_love_open_source]: https://cpco.io/we-love-open-source?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=we_love_open_source - [terraform_modules]: https://cpco.io/terraform-modules?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=terraform_modules - [readme_header_img]: https://cloudposse.com/readme/header/img - [readme_header_link]: https://cloudposse.com/readme/header/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=readme_header_link - [readme_footer_img]: https://cloudposse.com/readme/footer/img - [readme_footer_link]: https://cloudposse.com/readme/footer/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=readme_footer_link - [readme_commercial_support_img]: https://cloudposse.com/readme/commercial-support/img - [readme_commercial_support_link]: https://cloudposse.com/readme/commercial-support/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/test-harness&utm_content=readme_commercial_support_link + [docs]: https://cpco.io/docs + [website]: https://cpco.io/homepage + [github]: https://cpco.io/github + [jobs]: https://cpco.io/jobs + [hire]: https://cpco.io/hire + [slack]: https://cpco.io/slack + [linkedin]: https://cpco.io/linkedin + [twitter]: https://cpco.io/twitter + [testimonial]: https://cpco.io/leave-testimonial + [newsletter]: https://cpco.io/newsletter + [email]: https://cpco.io/email + [commercial_support]: https://cpco.io/commercial-support + [we_love_open_source]: https://cpco.io/we-love-open-source + [module_development]: https://cpco.io/module-development + [terraform_modules]: https://cpco.io/terraform-modules + [readme_header_img]: https://cloudposse.com/readme/header/img?repo=cloudposse/test-harness + [readme_header_link]: https://cloudposse.com/readme/header/link?repo=cloudposse/test-harness + [readme_footer_img]: https://cloudposse.com/readme/footer/img?repo=cloudposse/test-harness + [readme_footer_link]: https://cloudposse.com/readme/footer/link?repo=cloudposse/test-harness + [readme_commercial_support_img]: https://cloudposse.com/readme/commercial-support/img?repo=cloudposse/test-harness + [readme_commercial_support_link]: https://cloudposse.com/readme/commercial-support/link?repo=cloudposse/test-harness [share_twitter]: https://twitter.com/intent/tweet/?text=test-harness&url=https://github.com/cloudposse/test-harness [share_linkedin]: https://www.linkedin.com/shareArticle?mini=true&title=test-harness&url=https://github.com/cloudposse/test-harness [share_reddit]: https://reddit.com/submit/?url=https://github.com/cloudposse/test-harness diff --git a/codefresh.yml b/codefresh.yml deleted file mode 100644 index 24312dc..0000000 --- a/codefresh.yml +++ /dev/null @@ -1,109 +0,0 @@ -version: '1.0' - -steps: - init_variables: - title: Init variables - image: alpine - commands: - - cf_export BUILD_HARNESS_VERSION=0.10.2 - - cf_export GIT_BRANCH=${{CF_BRANCH}} - - build_image: - title: Build image - type: build - description: Build test-harness - image_name: test-harness - dockerfile: Dockerfile - - semver: - title: Export semantic version - image: cloudposse/build-harness:${{BUILD_HARNESS_VERSION}} - working_directory: ${{build_image}} - commands: - - make semver/export >> ${{CF_VOLUME_PATH}}/env_vars_to_export - - push_image_commit_to_cfcr: - title: Push image with commit based semver tags - type: push - candidate: ${{build_image}} - tags: - - "${{SEMVERSION_COMMIT_SHORT}}" - - push_image_commit_to_dockerhub: - title: Push image with commit based semver tags - type: push - registry: dockerhub - image_name: cloudposse/test-harness - candidate: ${{build_image}} - tags: - - "${{SEMVERSION_COMMIT_SHORT}}" - - push_image_branch_to_cfcr: - title: Push image with branch based semver tags - type: push - candidate: ${{build_image}} - tags: - - "${{SEMVERSION_BRANCH_COMMIT_SHORT}}" - when: - condition: - all: - executeForBranch: "'${{SEMVERSION_BRANCH}}' != ''" - - push_image_branch_to_dockerhub: - title: Push image with branch based semver tags - type: push - registry: dockerhub - image_name: cloudposse/test-harness - candidate: ${{build_image}} - tags: - - "${{SEMVERSION_BRANCH}}" - when: - condition: - all: - executeForBranch: "'${{SEMVERSION_BRANCH}}' != ''" - - push_image_tag_to_cfcr: - title: Push image with tag based semver tags - type: push - registry: cfcr - candidate: ${{build_image}} - tag: "${{SEMVERSION_TAG}}" - when: - condition: - all: - executeForTag: "'${{SEMVERSION_TAG}}' != ''" - - push_image_tag_to_dockerhub: - title: Push image with tag based semver tags - type: push - registry: dockerhub - image_name: cloudposse/test-harness - candidate: ${{build_image}} - tag: "${{SEMVERSION_TAG}}" - when: - condition: - all: - executeForTag: "'${{SEMVERSION_TAG}}' != ''" - - push_image_latest_to_cfcf: - title: Push image with latest tag - type: push - registry: cfcr - candidate: ${{build_image}} - tag: latest - when: - condition: - all: - executeForMasterBranch: "'${{CF_BRANCH}}' == 'master'" - - push_image_latest_to_dockerhub: - title: Push image with latest tag - type: push - registry: dockerhub - image_name: cloudposse/test-harness - candidate: ${{build_image}} - tag: latest - when: - condition: - all: - executeForMasterBranch: "'${{CF_BRANCH}}' == 'master'" diff --git a/docs/targets.md b/docs/targets.md index 14a1f11..bddd5dc 100644 --- a/docs/targets.md +++ b/docs/targets.md @@ -2,13 +2,9 @@ ``` Available targets: - all Initialize test-harness, install deps, build docker container, install wrapper script and run shell build Build docker image - deps Install dependencies (if any) help Help screen help/all Display help for all targets help/short This help short screen - install Install wrapper script from geodesic container - push Push docker image to registry ```