Skip to content

Commit

Permalink
Merge pull request #14 from reactiveops/rs/update-ci-and-docs
Browse files Browse the repository at this point in the history
Removing Github release from CI, updating image references in docs
  • Loading branch information
ejether authored Mar 28, 2018
2 parents 8a74f24 + 494ce31 commit b9c0de9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
11 changes: 0 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ references:
docker push quay.io/reactiveops/rbac-manager:$DOCKER_BASE_TAG
docker push quay.io/reactiveops/rbac-manager:$DOCKER_BASE_TAG-ci
github_release: &github_release
run:
name: GitHub release
command: |
git fetch --tags
curl -O https://raw.githubusercontent.com/reactiveops/release.sh/v0.0.2/release
/bin/bash release
jobs:
build:
docker:
Expand All @@ -35,10 +27,7 @@ jobs:
steps:
- checkout
- setup_remote_docker
- run: echo 'export GITHUB_ORGANIZATION=$CIRCLE_PROJECT_USERNAME' >> $BASH_ENV
- run: echo 'export GITHUB_REPOSITORY=$CIRCLE_PROJECT_REPONAME' >> $BASH_ENV
- run: echo 'export DOCKER_BASE_TAG=$CIRCLE_TAG' >> $BASH_ENV
- *github_release
- *docker_build_and_push


Expand Down
2 changes: 1 addition & 1 deletion examples/ci/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ references:
jobs:
build:
docker:
- image: quay.io/reactiveops/rbac-manager:0.1.4-ci
- image: quay.io/reactiveops/rbac-manager:0.3.0-ci
steps:
- checkout:
path: /rbac-manager/ci
Expand Down
2 changes: 1 addition & 1 deletion examples/k8s/job/03-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
serviceAccountName: rbac-manager
containers:
- name: rbac-manager
image: quay.io/reactiveops/rbac-manager:latest
image: quay.io/reactiveops/rbac-manager:0.3.0
command:
- python
- manage_rbac.py
Expand Down

0 comments on commit b9c0de9

Please sign in to comment.