Skip to content

Commit

Permalink
Merge pull request #14 from turnerlabs/version-bump
Browse files Browse the repository at this point in the history
New versions, more OSS stuff
  • Loading branch information
awlawl authored Nov 8, 2022
2 parents 0414e6d + 5e73bdc commit e55a24b
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 12 deletions.
44 changes: 44 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# How to Contribute

There are a few guidelines that we need external contributors to follow so that we are able to process requests as efficiently as possible.

If you have any questions or concerns please contact a project maintainer who is an active community leader.

Follow these steps:

1. [Getting Started](#getting-started)
2. [Making Changes](#making-changes)
3. [Submitting Changes](#submitting-changes)

## Getting Started

* Make sure you have a [GitHub account](https://github.com/signup/free).
* Submit an [issue](../../issues), assuming one does not already exist.
- Clearly describe the issue including steps to reproduce when it is a bug.
- Make sure you fill in the earliest version that you know has the issue.
* Fork the repository on GitHub.

## Making Changes

* Create a topic branch off of `main` before you start your work.
- Please avoid working directly on the `main` branch.
* Make commits of logical units.
- You may be asked to squash unnecessary commits down to logical units.
* Check for unnecessary whitespace with `git diff --check` before committing.
* Write meaningful, descriptive commit messages which follow the [conventional commits](https://www.conventionalcommits.org/) format.
* Please follow existing code conventions when working on a file.

## Submitting Changes

* Push your changes to a topic branch in your fork of the repository.
* Submit a pull request to the repository in the [WarnerMedia](https://github.com/WarnerMedia) organization.
- You will be prompted to accept the Contributor License Agreement (CLA) as part of setting up your first Pull Request.
* After feedback has been given, we expect responses within two weeks. After two weeks we may close the pull request (if it isn't showing any activity).
* Bug fixes or features that lack appropriate tests may not be considered for merge.
* Changes that lower test coverage may not be considered for merge.

# Additional Resources

* [General GitHub documentation](https://help.github.com/).
* [GitHub pull request documentation](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/about-pull-requests).
* The format of this document was inspired by [Nike's `CONTRIBUTING.md` file](https://github.com/Nike-Inc/gimme-aws-creds/blob/master/CONTRIBUTING.md).
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:18.04
# install cli tools
ENV DOCKER_VERSION 19.03.6
ENV DC_VERSION 1.25.3
ENV FARGATE_VERSION v0.8.0
ENV FARGATE_VERSION v0.12.1

RUN apt-get update && \
apt-get install --no-install-recommends -y \
Expand All @@ -22,7 +22,7 @@ RUN apt-get update && \
rm docker-${DOCKER_VERSION}.tgz && \
curl -sSfLo /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/${DC_VERSION}/docker-compose-`uname -s`-`uname -m` && \
chmod +x /usr/local/bin/docker-compose && \
curl -sSfLO https://bootstrap.pypa.io/get-pip.py && \
curl -sSfLO https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
python get-pip.py --user && \
python -m pip install awscli && \
curl -sSfLo /usr/local/bin/fargate https://github.com/turnerlabs/fargate/releases/download/${FARGATE_VERSION}/ncd_linux_amd64 && \
Expand Down
28 changes: 18 additions & 10 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
Copyright 2018 Turner
The MIT License (MIT)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Copyright (c) Warner Media, LLC. All other rights reserved.

http://www.apache.org/licenses/LICENSE-2.0
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
6 changes: 6 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: "2"
services:
cicd:
build: .
image: ghcr.io/warnermedia/fargate-cicd:v0.12.1

0 comments on commit e55a24b

Please sign in to comment.