Skip to content

Commit

Permalink
Merge pull request quintush#57 from quintush/feature/GeneralizeReleas…
Browse files Browse the repository at this point in the history
…eAndCapabilities

Update docker deployment and versioning order
  • Loading branch information
quintush authored Aug 31, 2020
2 parents 9968e7b + 2408f1d commit e10bae1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- setup_remote_docker
- run:
name: Build and push docker images
command: docker-build.sh
command: make dockerdist

orbs:
sonarcloud: sonarsource/[email protected]
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ dist:
.PHONY: bootstrap
bootstrap:

.PHONY: dockerdist
dockerdist:
./docker-build.sh

.PHONY: dockerimage
dockerimage:
docker build -t $(DOCKER):$(VERSION) .
8 changes: 4 additions & 4 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ helmRepo="helm/helm"
pluginRepo="quintush/helm-unittest"

if [[ ${CI} == 'true' ]]; then
helmLatest=`curl -sL -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/${helmRepo}/tags?per_page=50 |jq -r ".[].name"|sort -Vr|sed 's/^v//'`
pluginLatest=`curl -sL -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/${pluginRepo}/tags?per_page=2 |jq -r ".[].name"|sort -Vr|sed 's/^v//'`
helmLatest=`curl -sL -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/${helmRepo}/tags?per_page=50 |jq -r ".[].name"|sed 's/^v//'|sort -V |grep -v -`
pluginLatest=`curl -sL -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/${pluginRepo}/tags?per_page=2 |jq -r ".[].name"|sed 's/^v//'|sort -V |grep -v -`
else
helmLatest=`curl -sL https://api.github.com/repos/${helmRepo}/tags?per_page=50 |jq -r ".[].name"|sort -Vr|sed 's/^v//'|grep -v -`
pluginLatest=`curl -sL https://api.github.com/repos/${pluginRepo}/tags?per_page=2 |jq -r ".[].name"|sort -Vr|sed 's/^v//'|grep -v -`
helmLatest=`curl -sL https://api.github.com/repos/${helmRepo}/tags?per_page=50 |jq -r ".[].name"| sed 's/^v//'| sort -V |grep -v -`
pluginLatest=`curl -sL https://api.github.com/repos/${pluginRepo}/tags?per_page=2 |jq -r ".[].name"| sed 's/^v//'| sort -V |grep -v -`
fi

for helmVersion in ${helmLatest}
Expand Down

0 comments on commit e10bae1

Please sign in to comment.