-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from Azure-Samples/revert-13-revert-10-master
Revert "Revert "update task version to 1.1.0""
- Loading branch information
Showing
20 changed files
with
503 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- cmd: bash:3.0 echo hello world |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- cmd: bash echo hello world |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- build: -t {{.Run.Registry}}/hello-world -f hello-world.dockerfile . | ||
- build: -t $Registry/hello-world -f hello-world.dockerfile . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- build: -t {{.Run.Registry}}/hello-world:{{.Run.ID}} -t {{.Run.Registry}}/hello-world:latest -f hello-world.dockerfile . | ||
- build: -t $Registry/hello-world:$ID -t $Registry/hello-world:latest -f hello-world.dockerfile . | ||
- push: | ||
- {{.Run.Registry}}/hello-world:{{.Run.ID}} | ||
- {{.Run.Registry}}/hello-world:latest | ||
- $Registry/hello-world:$ID | ||
- $Registry/hello-world:latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- build: -t {{.Run.Registry}}/hello-world:{{.Run.ID}} -f hello-world.dockerfile . | ||
- push: ["{{.Run.Registry}}/hello-world:{{.Run.ID}}"] | ||
- build: -t $Registry/hello-world:$ID -f hello-world.dockerfile . | ||
- push: | ||
- $Registry/hello-world:$ID |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- build: -t {{.Run.Registry}}/hello-world:{{.Run.ID}} -f hello-world.dockerfile . | ||
- build: -t $Registry/hello-world:$ID -f hello-world.dockerfile . | ||
- push: | ||
- {{.Run.Registry}}/hello-world:{{.Run.ID}} | ||
- cmd: {{.Run.Registry}}/hello-world:{{.Run.ID}} | ||
- $Registry/hello-world:$ID | ||
- cmd: $Registry/hello-world:$ID |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
# build website and func-test images, concurrently | ||
- build: -t {{.Run.Registry}}/hello-world:{{.Run.ID}} -f hello-world.dockerfile . | ||
- build: -t $Registry/hello-world:$ID -f hello-world.dockerfile . | ||
when: ["-"] | ||
- build: -t hello-world-test -f hello-world.dockerfile . | ||
when: ["-"] | ||
# run built images to be tested | ||
- id: hello-world | ||
cmd: {{.Run.Registry}}/hello-world:{{.Run.ID}} | ||
cmd: $Registry/hello-world:$ID | ||
- id: func-tests | ||
cmd: hello-world-test | ||
env: | ||
- test-target=hello-world | ||
# push hello-world if func-tests are successful | ||
- push: | ||
- {{.Run.Registry}}/hello-world:{{.Run.ID}} | ||
- $Registry/hello-world:$ID | ||
# helm deploy the updated hello-world image | ||
- cmd: > | ||
cmd.azurecr.io/helm:v2.11.0-rc.2 update helloworld ./release/helm/ | ||
--reuse-values | ||
--set helloworld.image={{.Run.Registry}}/hello-world:{{.Run.ID}} | ||
--set helloworld.image=$Registry/hello-world:$ID |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
version: v1.1.0 | ||
steps: | ||
- build: -t $Registry/hello-world:$ID -f hello-world.dockerfile . | ||
cache: enabled | ||
- push: | ||
- "$Registry/hello-world:$ID" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
version: v1.0.0 | ||
version: v1.1.0 | ||
steps: | ||
- cmd: hello-world |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
version: v1.1.0 | ||
alias: | ||
values: | ||
repo: my-website | ||
secrets: | ||
- id: name | ||
keyvault: https://myacbvault2.vault.azure.net/secrets/SampleSecret | ||
steps: | ||
- cmd: bash -c 'if [ -z "$MY_SECRET" ]; then echo "Secret not resolved"; else echo "Secret resolved"; fi' | ||
env: | ||
- MY_SECRET='{{.Secrets.name}}' | ||
|
||
# Build/Push the website to source registry | ||
- cmd: docker build -t $Registry/repo:$ID https://github.com/Azure-Samples/aci-helloworld.git | ||
- push: | ||
- "$Registry/repo:$ID" | ||
|
||
# Login to Azure and list the tags to verify if we have the Image! | ||
- cmd: az login --identity | ||
- cmd: az acr repository show-tags -n {{.Values.registryName}} --repository repo |
Oops, something went wrong.