Skip to content

Commit

Permalink
remove old CI docker and outdated document references (#804)
Browse files Browse the repository at this point in the history
  • Loading branch information
ramaro committed Dec 8, 2021
1 parent a632eca commit 85dc161
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 282 deletions.
29 changes: 1 addition & 28 deletions .github/workflows/docker-image.yml
Expand Up @@ -52,40 +52,13 @@ jobs:
with:
tags: kapicorp/kapitan:${{ format('{0}', env.REF_NAME ) }},kapicorp/kapitan:latest
file: Dockerfile
- name: Build PR/latest/versioned ci tags
uses: docker/build-push-action@v2
with:
tags: kapicorp/kapitan:${{ format('{0}-ci', env.REF_NAME ) }}
push: ${{ github.event_name != 'pull_request' }} # push image only on non-pull_requests
file: Dockerfile.ci
- name: Test both Dockerfile and Dockerfile.ci in current ref
- name: Test Dockerfile in current ref
run: |
[ ${{ env.REF_NAME }} == "master" ] && tagname="latest" || tagname=${{ env.REF_NAME }}
docker run -t --rm kapicorp/kapitan:${tagname} --version
docker run -t --rm kapicorp/kapitan:${{ env.REF_NAME }}-ci kapitan --version
- name: Build major version tag
uses: docker/build-push-action@v2
if: startsWith(github.ref, 'refs/tags/')
with:
tags: kapicorp/kapitan:${{ format('{0}', env.MAJOR_VERSION ) }}
file: Dockerfile

# TODO push and tag as latest if release (and not RC)
- name: Build latest ci tag
uses: docker/build-push-action@v2
if: github.ref == 'refs/heads/master'
with:
tags: kapicorp/kapitan:ci
file: Dockerfile.ci
- name: Build version ci tag
uses: docker/build-push-action@v2
if: startsWith(github.ref, 'refs/tags/')
with:
tags: kapicorp/kapitan:${{ format('{0}-ci', env.TAG_VERSION ) }}
file: Dockerfile.ci
- name: Build major version ci tag
uses: docker/build-push-action@v2
if: startsWith(github.ref, 'refs/tags/')
with:
tags: kapicorp/kapitan:${{ format('{0}-ci', env.MAJOR_VERSION ) }}
file: Dockerfile.ci
78 changes: 0 additions & 78 deletions Dockerfile.ci

This file was deleted.

8 changes: 1 addition & 7 deletions Makefile
Expand Up @@ -6,18 +6,12 @@ test:
python3 -m unittest discover

.PHONY: test_docker
# for local testing, CI/CD uses docker github action for testing/pushing images
test_docker:
@echo ----- Testing build of docker image -----
docker build . --no-cache -t kapitan
@echo ----- Testing run of docker image -----
docker run -ti --rm kapitan --help
docker run -ti --rm kapitan lint
@echo ----- Testing build of docker ci image -----
docker build . --no-cache -t kapitan-ci -f Dockerfile.ci
@echo ----- Testing run of docker ci image -----
docker run -ti --rm kapitan-ci kapitan --help
docker run -ti --rm kapitan-ci kapitan lint

.PHONY: test_coverage
test_coverage:
Expand Down Expand Up @@ -62,4 +56,4 @@ local_serve_documentation:
.PHONY: mkdocs_gh_deploy
mkdocs_gh_deploy: # to run locally assuming git ssh access
docker build -f Dockerfile.docs --no-cache -t kapitan-docs .
docker run --rm -it -v $(PWD):/src -v ~/.ssh:/root/.ssh -w /src kapitan-docs gh-deploy -f ./mkdocs.yml
docker run --rm -it -v $(PWD):/src -v ~/.ssh:/root/.ssh -w /src kapitan-docs gh-deploy -f ./mkdocs.yml
4 changes: 0 additions & 4 deletions README.md
Expand Up @@ -70,8 +70,6 @@ docker run -t --rm -v $(pwd):/src:delegated kapicorp/kapitan -h

On Linux you can add `-u $(id -u)` to `docker run` to preserve file permissions.

For CI/CD usage, check out [CI.md](docs/CI.md)

#### Pip

Kapitan needs Python 3.7.
Expand Down Expand Up @@ -141,8 +139,6 @@ Compiled minikube-es
### Miscellaneous

- [Usage](docs/usage.md)
- [Continuous Integration](docs/CI.md)
- [Set up kapitan on older Python systems](docs/pyenv-scl.md)

### Examples

Expand Down
35 changes: 0 additions & 35 deletions docs/CI.md

This file was deleted.

4 changes: 0 additions & 4 deletions docs/README.md
Expand Up @@ -70,8 +70,6 @@ docker run -t --rm -v $(pwd):/src:delegated kapicorp/kapitan -h

On Linux you can add `-u $(id -u)` to `docker run` to preserve file permissions.

For CI/CD usage, check out [CI.md](CI.md)

#### Pip

Kapitan needs Python 3.6.
Expand Down Expand Up @@ -141,8 +139,6 @@ Compiled minikube-es
### Miscellaneous

- [Usage](usage.md)
- [Continuous Integration](CI.md)
- [Set up kapitan on older Python systems](pyenv-scl.md)

### Examples

Expand Down
124 changes: 0 additions & 124 deletions docs/pyenv-scl.md

This file was deleted.

2 changes: 0 additions & 2 deletions mkdocs.yml
Expand Up @@ -16,8 +16,6 @@ nav:
- Manifest validation: validate.md
- External dependency management: external_dependencies.md
- Miscellaneous:
- Continuous Integration: CI.md
- Set up kapitan on older Python systems: pyenv-scl.md
- Usage: usage.md
- Proposals: proposals.md
- Examples:
Expand Down

0 comments on commit 85dc161

Please sign in to comment.