Skip to content

Commit

Permalink
git_pull: Collection of improvements (home-assistant#901)
Browse files Browse the repository at this point in the history
* git_pull: Prettier YAML files

* git_pull: Move run.sh to data folder

* git_pull: Update add-on URL

* git_pull: Pin add-on base images

* git_pull: Documentation tweak

* git_pull: Remove installation of curl, part of base image

* git_pull: Styling tweak to Dockerfile
  • Loading branch information
frenck authored and pvizeli committed Dec 18, 2019
1 parent 646857b commit ed3f09a
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 17 deletions.
6 changes: 3 additions & 3 deletions git_pull/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ RUN apk add --no-cache jq curl git openssh-client
# Hass.io CLI
ARG BUILD_ARCH
ARG CLI_VERSION
RUN apk add --no-cache curl \
&& curl -Lso /usr/bin/hassio https://github.com/home-assistant/hassio-cli/releases/download/${CLI_VERSION}/hassio_${BUILD_ARCH} \
RUN curl -Lso /usr/bin/hassio \
"https://github.com/home-assistant/hassio-cli/releases/download/${CLI_VERSION}/hassio_${BUILD_ARCH}" \
&& chmod a+x /usr/bin/hassio

# Copy data
COPY run.sh /
COPY data/run.sh /

CMD [ "/run.sh" ]
11 changes: 6 additions & 5 deletions git_pull/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository.

## Installation

The installation of this add-on is straightforward and easy to do.
Follow these steps to get the add-on installed on your system:

1. Navigate in your Home Assistant frontend to **Hass.io** -> **Add-on Store**.
2. Find the "Git pull" add-on and click it.
Expand Down Expand Up @@ -135,10 +135,11 @@ A private SSH key that will be used for communication during Git operations. Thi
### Option: `deployment_key_protocol` (optional)

The key protocol. Default is `rsa`. Valid protocols are:
- dsa
- ecdsa
- ed25519
- rsa

- dsa
- ecdsa
- ed25519
- rsa

The protocol is typically known by the suffix of the private key --e.g., a key file named `id_rsa` will be a private key using `rsa` protocol.

Expand Down
15 changes: 7 additions & 8 deletions git_pull/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
trigger:
branches:
include:
- master
- master
paths:
include:
- git_pull/*
- git_pull/*
pr: none

variables:
- name: versionBuilder
value: '2.0'
value: "2.0"
- group: docker


jobs:
- template: /.azure/azp-template-addon.yml
parameters:
addon: 'git_pull'
arch: '--all'
- template: /.azure/azp-template-addon.yml
parameters:
addon: "git_pull"
arch: "--all"
7 changes: 7 additions & 0 deletions git_pull/build.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"build_from": {
"aarch64": "homeassistant/aarch64-base:3.10",
"amd64": "homeassistant/amd64-base:3.10",
"armhf": "homeassistant/armhf-base:3.10",
"armv7": "homeassistant/armv7-base:3.10",
"i386": "homeassistant/i386-base:3.10"
},
"args": {
"CLI_VERSION": "3.1.1"
}
Expand Down
2 changes: 1 addition & 1 deletion git_pull/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "7.7",
"slug": "git_pull",
"description": "Simple git pull to update the local configuration",
"url": "https://home-assistant.io/addons/git_pull/",
"url": "https://github.com/home-assistant/hassio-addons/tree/master/git_pull",
"arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
"startup": "services",
"boot": "manual",
Expand Down
File renamed without changes.

0 comments on commit ed3f09a

Please sign in to comment.