Skip to content

Commit

Permalink
update build
Browse files Browse the repository at this point in the history
  • Loading branch information
pvizeli committed Mar 6, 2020
1 parent a99cc89 commit a670f9d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
17 changes: 8 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ pr:
variables:
versionHadolint: 'v1.17.3'
versionShellCheck: 'v0.7.0'
versionBuilder: '6.8'
versionBuilder: '7.1'

jobs:

- job: 'Hadolint'
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-latest'
steps:
- script: sudo docker pull hadolint/hadolint:$(versionHadolint)
displayName: 'Install Hadolint'
Expand All @@ -34,7 +34,7 @@ jobs:
- job: 'ShellCheck'
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-latest'
steps:
- script: sudo docker pull koalaman/shellcheck:$(versionShellCheck)
displayName: 'Install ShellCheck'
Expand All @@ -50,7 +50,7 @@ jobs:
- 'Hadolint'
- 'ShellCheck'
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-latest'
steps:
- script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
displayName: 'Docker hub login'
Expand All @@ -60,8 +60,8 @@ jobs:
sudo docker run --rm --privileged \
-v ~/.docker:/root/.docker \
-v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
homeassistant/amd64-builder:$(versionBuilder) --hassio-cli dev \
--all -t /data --docker-hub homeassistant
homeassistant/amd64-builder:$(versionBuilder) \
--generic dev --all -t /data
displayName: 'Build DEV'
Expand All @@ -71,7 +71,7 @@ jobs:
- 'Hadolint'
- 'ShellCheck'
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-latest'
steps:
- script: sudo docker login -u $(dockerUser) -p $(dockerPassword)
displayName: 'Docker hub login'
Expand All @@ -82,6 +82,5 @@ jobs:
-v ~/.docker:/root/.docker \
-v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
homeassistant/amd64-builder:$(versionBuilder) \
--hassio-cli $(Build.SourceBranchName) \
--all -t /data --docker-hub homeassistant
--generic $(Build.SourceBranchName) --all -t /data
displayName: 'Build Release'
13 changes: 13 additions & 0 deletions build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"image": "homeassistant/{arch}-hassio-cli",
"build_from": {
"aarch64": "homeassistant/aarch64-base:3.11",
"armhf": "homeassistant/armhf-base:3.11",
"armv7": "homeassistant/armv7-base:3.11",
"amd64": "homeassistant/amd64-base:3.11",
"i386": "homeassistant/i386-base:3.11"
},
"labels": {
"io.hass.type": "cli"
}
}

0 comments on commit a670f9d

Please sign in to comment.