From eb55f12e9af2d83019127b41c5a5288340945945 Mon Sep 17 00:00:00 2001 From: Timmo Date: Fri, 4 Jan 2019 13:28:32 +0000 Subject: [PATCH 01/10] :books: Update maintenance shield --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b97138..2584373 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,7 @@ SOFTWARE. [issue]: https://github.com/hassio-addons/addon-home-panel/issues [keepchangelog]: http://keepachangelog.com/en/1.0.0/ [license-shield]: https://img.shields.io/github/license/hassio-addons/addon-home-panel.svg -[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg [patreon-shield]: https://www.frenck.nl/images/patreon.png [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg From d5b24c7ecd6b54480d7867d5b532676cb4f31f76 Mon Sep 17 00:00:00 2001 From: Timmo Date: Mon, 7 Jan 2019 17:57:52 +0000 Subject: [PATCH 02/10] :arrow_up: Upgrades add-on base image in Dockerfile to version 2.3.1 --- home-panel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile index 15cbe85..869ac73 100644 --- a/home-panel/Dockerfile +++ b/home-panel/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/base:2.3.0 +ARG BUILD_FROM=hassioaddons/base:2.3.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} From f7fda120f199ab5f04547779f587fc83bd363d82 Mon Sep 17 00:00:00 2001 From: Timmo Date: Mon, 7 Jan 2019 17:57:53 +0000 Subject: [PATCH 03/10] :arrow_up: Upgrades add-on base image in build file to version 2.3.1 --- home-panel/build.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/home-panel/build.json b/home-panel/build.json index 8bc6c9a..a15de00 100644 --- a/home-panel/build.json +++ b/home-panel/build.json @@ -1,10 +1,10 @@ { - "squash": false, + "args": {}, "build_from": { - "aarch64": "hassioaddons/base-aarch64:2.3.0", - "amd64": "hassioaddons/base-amd64:2.3.0", - "armhf": "hassioaddons/base-armhf:2.3.0", - "i386": "hassioaddons/base-i386:2.3.0" + "aarch64": "hassioaddons/base-aarch64:2.3.1", + "amd64": "hassioaddons/base-amd64:2.3.1", + "armhf": "hassioaddons/base-armhf:2.3.1", + "i386": "hassioaddons/base-i386:2.3.1" }, - "args": {} -} + "squash": false +} \ No newline at end of file From e9f2cdbbf70e01be4e385b1634362dbfb5a9b357 Mon Sep 17 00:00:00 2001 From: Timmo Date: Mon, 7 Jan 2019 18:45:42 +0000 Subject: [PATCH 04/10] :arrow_up: Upgrades Home-panel-api to version v0.4.3 --- home-panel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile index 869ac73..a622d7e 100644 --- a/home-panel/Dockerfile +++ b/home-panel/Dockerfile @@ -13,7 +13,7 @@ RUN \ nodejs-current=9.11.1-r2 \ nginx=1.14.2-r0 \ \ - && git clone --branch "v0.4.2" --depth=1 \ + && git clone --branch "v0.4.3" --depth=1 \ "https://github.com/timmo001/home-panel-api.git" /opt/api \ \ && curl -J -L -o /tmp/panel.zip \ From cba3fb4cdf2fba4d221c1a7f84fd69646d94ac29 Mon Sep 17 00:00:00 2001 From: Timmo Date: Mon, 7 Jan 2019 18:45:44 +0000 Subject: [PATCH 05/10] :arrow_up: Upgrades Home-panel to version v0.6.9 --- home-panel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile index a622d7e..fec6bc7 100644 --- a/home-panel/Dockerfile +++ b/home-panel/Dockerfile @@ -17,7 +17,7 @@ RUN \ "https://github.com/timmo001/home-panel-api.git" /opt/api \ \ && curl -J -L -o /tmp/panel.zip \ - "https://github.com/timmo001/home-panel/releases/download/v0.6.8/home-panel-built.zip" \ + "https://github.com/timmo001/home-panel/releases/download/v0.6.9/home-panel-built.zip" \ && unzip -d /tmp /tmp/panel.zip \ && mv /tmp/build /opt/panel \ \ From 9e8fc5ba7e4a8707901f67aa17449bb42a7e1182 Mon Sep 17 00:00:00 2001 From: Timmo Date: Mon, 7 Jan 2019 22:40:44 +0000 Subject: [PATCH 06/10] :books: Update maintenance year --- home-panel/.README.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-panel/.README.j2 b/home-panel/.README.j2 index 74255a8..6698f4d 100644 --- a/home-panel/.README.j2 +++ b/home-panel/.README.j2 @@ -75,7 +75,7 @@ If you are more interested in stable releases of our add-ons: [docs]: {{ repo }}/blob/{{ version }}/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/home-panel-a-touch-compatible-webapp-for-controlling-the-home/62597?u=timmo001 -[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg [patreon-shield]: https://www.frenck.nl/images/patreon.png [patreon]: https://www.patreon.com/frenck [pi-hole]: https://pi-hole.net/ From 7042c050c6a4db24ee29c85cced1b37f22df3aac Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Jan 2019 19:11:32 +0100 Subject: [PATCH 07/10] :fire: Removes BountySource links --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 2584373..fa50df4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ ![Project Maintenance][maintenance-shield] [![GitHub Activity][commits-shield]][commits] -[![Bountysource][bountysource-shield]][bountysource] [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum] @@ -241,8 +240,6 @@ SOFTWARE. [armhf-microbadger]: https://microbadger.com/images/hassioaddons/home-panel-armhf [armhf-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/home-panel-armhf.svg [armhf-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/home-panel-armhf.svg -[bountysource-shield]: https://img.shields.io/bountysource/team/hassio-addons/activity.svg -[bountysource]: https://www.bountysource.com/teams/hassio-addons/issues [buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg [buymeacoffee]: https://www.buymeacoffee.com/frenck [commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-home-panel.svg From 92fde04b0be6fd52ddc4b190b8a0f8571d157f1e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Jan 2019 19:42:07 +0100 Subject: [PATCH 08/10] :fire: Removes Anchore.io links --- README.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/README.md b/README.md index fa50df4..665cafc 100644 --- a/README.md +++ b/README.md @@ -59,25 +59,21 @@ comparison to installing any other Hass.io add-on. [![Docker Version][armhf-version-shield]][armhf-microbadger] [![Docker Layers][armhf-layers-shield]][armhf-microbadger] [![Docker Pulls][armhf-pulls-shield]][armhf-dockerhub] -[![Anchore Image Overview][armhf-anchore-shield]][armhf-anchore] [![Docker Architecture][aarch64-arch-shield]][aarch64-dockerhub] [![Docker Version][aarch64-version-shield]][aarch64-microbadger] [![Docker Layers][aarch64-layers-shield]][aarch64-microbadger] [![Docker Pulls][aarch64-pulls-shield]][aarch64-dockerhub] -[![Anchore Image Overview][aarch64-anchore-shield]][aarch64-anchore] [![Docker Architecture][amd64-arch-shield]][amd64-dockerhub] [![Docker Version][amd64-version-shield]][amd64-microbadger] [![Docker Layers][amd64-layers-shield]][amd64-microbadger] [![Docker Pulls][amd64-pulls-shield]][amd64-dockerhub] -[![Anchore Image Overview][amd64-anchore-shield]][amd64-anchore] [![Docker Architecture][i386-arch-shield]][i386-dockerhub] [![Docker Version][i386-version-shield]][i386-microbadger] [![Docker Layers][i386-layers-shield]][i386-microbadger] [![Docker Pulls][i386-pulls-shield]][i386-dockerhub] -[![Anchore Image Overview][i386-anchore-shield]][i386-anchore] ## Configuration @@ -215,8 +211,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -[aarch64-anchore-shield]: https://anchore.io/service/badges/image/3a52e98fc35e238711880453f882da1578f46af2019f705077a1202b633c2b21 -[aarch64-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fhome-panel-aarch64%3Alatest [aarch64-arch-shield]: https://img.shields.io/badge/architecture-aarch64-blue.svg [aarch64-dockerhub]: https://hub.docker.com/r/hassioaddons/home-panel-aarch64 [aarch64-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/home-panel-aarch64.svg @@ -224,16 +218,12 @@ SOFTWARE. [aarch64-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/home-panel-aarch64.svg [aarch64-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/home-panel-aarch64.svg [alpine-packages]: https://pkgs.alpinelinux.org/packages -[amd64-anchore-shield]: https://anchore.io/service/badges/image/f7a8fc048af61c13119239a4411cead2cf775029eb09f7af3e0a2f5183d0669a -[amd64-anchore]: https://anchore.io/image/dockerhub/hassioaddons%home-panel-amd64%3Alatest [amd64-arch-shield]: https://img.shields.io/badge/architecture-amd64-blue.svg [amd64-dockerhub]: https://hub.docker.com/r/hassioaddons/home-panel-amd64 [amd64-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/home-panel-amd64.svg [amd64-microbadger]: https://microbadger.com/images/hassioaddons/home-panel-amd64 [amd64-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/home-panel-amd64.svg [amd64-version-shield]: https://images.microbadger.com/badges/version/hassioaddons/home-panel-amd64.svg -[armhf-anchore-shield]: https://anchore.io/service/badges/image/8299a0af4020e22be2a2dd91dbc84e39babeae5178680278d51881ffba88d949 -[armhf-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fhome-panel-armhf%3Alatest [armhf-arch-shield]: https://img.shields.io/badge/architecture-armhf-blue.svg [armhf-dockerhub]: https://hub.docker.com/r/hassioaddons/home-panel-armhf [armhf-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/home-panel-armhf.svg @@ -254,8 +244,6 @@ SOFTWARE. [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-home-panel/badges/master/pipeline.svg [gitlabci]: https://gitlab.com/hassio-addons/addon-home-panel/pipelines [home-assistant]: https://home-assistant.io -[i386-anchore-shield]: https://anchore.io/service/badges/image/491da5d9a64e7173746bce5053145c57199e81cbc87f0dfbea9bcab1186b91db -[i386-anchore]: https://anchore.io/image/dockerhub/hassioaddons%2Fhome-panel-i386%3Alatest [i386-arch-shield]: https://img.shields.io/badge/architecture-i386-blue.svg [i386-dockerhub]: https://hub.docker.com/r/hassioaddons/home-panel-i386 [i386-layers-shield]: https://images.microbadger.com/badges/image/hassioaddons/home-panel-i386.svg From d99e39ace295131ce04be1f4c82cdebbf3205616 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Jan 2019 20:03:28 +0100 Subject: [PATCH 09/10] :fireworks: Updates maintenance year to 2019 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 665cafc..2eff365 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2018 Franck Nijhof +Copyright (c) 2018-2019 Franck Nijhof Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2f954a2a177d7a1bdfe19ad7b56ed328f7596e5d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Jan 2019 20:16:07 +0100 Subject: [PATCH 10/10] :tractor: :rocket: Refactor of GitLab CI --- .gitlab-ci.yml | 434 +------------------------------------------------ 1 file changed, 9 insertions(+), 425 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98893aa..27c0c68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,430 +1,14 @@ --- -image: docker:latest +include: https://raw.githubusercontent.com/hassio-addons/organization/master/gitlabci/addon.yml variables: - ADDON_GITHUB_REPO: hassio-addons/addon-home-panel - ADDON_SLUG: home-panel - ADDON_TARGET: home-panel - DOCKER_DRIVER: overlay2 - DOCKER_HUB_ORG: hassioaddons + ADDON_GITHUB_REPO: "hassio-addons/addon-home-panel" + ADDON_SLUG: "home-panel" + ADDON_TARGET: "home-panel" -stages: - - preflight - - build - - scan - - deploy - - manifest - - publish + ADDON_ARMV7: "false" -# Generic DIND template -.dind: &dind - before_script: - - docker info - services: - - name: docker:dind - command: ["--experimental"] - -# Generic preflight template -.preflight: &preflight - stage: preflight - tags: - - preflight - -# Generic build template -.build: &build - <<: *dind - stage: build - before_script: - - docker info - - | - if [ "$(apk --print-arch)" = "amd64" ]; then - docker run --rm --privileged hassioaddons/qemu-user-static:latest - fi - - | - echo "${CI_JOB_TOKEN}" | docker login \ - --username gitlab-ci-token \ - --password-stdin \ - registry.gitlab.com - - docker pull "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:cache" || true - script: - - | - docker build \ - --build-arg "BUILD_FROM=${FROM}" \ - --build-arg "BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ")" \ - --build-arg "BUILD_ARCH=${ADDON_ARCH}" \ - --build-arg "BUILD_REF=${CI_COMMIT_SHA}" \ - --build-arg "BUILD_VERSION=${CI_COMMIT_TAG:-${CI_COMMIT_SHA:0:7}}" \ - --cache-from "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:cache" \ - --tag \ - "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" \ - "${ADDON_TARGET}" - - | - docker push \ - "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" - -# Generic scan template -.scan: &scan - <<: *dind - stage: scan - allow_failure: true - before_script: - - docker info - - docker run -d --name db arminc/clair-db:latest - - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1 - - apk add -U curl ca-certificates - - | - curl \ - --silent \ - --show-error \ - --location \ - --fail \ - --retry 3 \ - --output /usr/bin/clair-scanner \ - https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64 - - chmod +x /usr/bin/clair-scanner - - touch clair-whitelist.yml - - echo "Waiting for Clair to start" - - | - while ! nc -z docker 6060; do - sleep 1 - WAIT=$((${WAIT} + 1)) - if [ "${WAIT}" -gt 30 ]; then - echo "Error > Timeout waiting for Clair to start" - exit 1 - fi - done - - docker pull "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" - script: - - | - clair-scanner \ - -c http://docker:6060 \ - --ip $(hostname -i) \ - -w clair-whitelist.yml \ - "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" - tags: - - scan - -# Generic deploy template -.deploy: &deploy - <<: *dind - stage: deploy - before_script: - - docker info - - docker pull "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" - - | - echo "${CI_JOB_TOKEN}" | docker login \ - --username gitlab-ci-token \ - --password-stdin \ - registry.gitlab.com - - | - echo "${DOCKER_PASSWORD}" | docker login \ - --username "${DOCKER_LOGIN}" \ - --password-stdin - script: - - | - docker tag \ - "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" \ - "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:cache" - - docker push "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:cache" - - TAG="${CI_COMMIT_TAG#v}" - - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}" - - | - docker tag \ - "registry.gitlab.com/${CI_PROJECT_PATH}/${ADDON_ARCH}:${CI_COMMIT_SHA}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${ADDON_ARCH}-${TAG}" - - | - docker push \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${ADDON_ARCH}-${TAG}" - tags: - - deploy - only: - - master - - /^v\d+\.\d+\.\d+(?:-(?:beta|rc)(?:(?:(?:\+|\.)?[a-zA-Z0-9]+)*)?)?$/ - except: - - /^(?!master).+@/ - -# Generic manifest template -.manifest: &manifest - <<: *dind - stage: manifest - before_script: - - mkdir -p ~/.docker - - echo '{"experimental":"enabled"}' > ~/.docker/config.json - - docker info - - | - echo "${DOCKER_PASSWORD}" | docker login \ - --username "${DOCKER_LOGIN}" \ - --password-stdin - script: - - TAG="${TAG#v}" - - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}" - - REF="${CI_COMMIT_TAG#v}" - - REF="${REF:-${CI_COMMIT_SHA:0:7}}" - - | - docker manifest create \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:aarch64-${REF}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:amd64-${REF}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:armhf-${REF}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:i386-${REF}" - - | - docker manifest annotate \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:aarch64-${REF}" \ - --os=linux \ - --arch=arm64 \ - --variant=v8 - - | - docker manifest annotate \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:amd64-${REF}" \ - --os=linux \ - --arch=amd64 - - | - docker manifest annotate \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:armhf-${REF}" \ - --os=linux \ - --arch=arm \ - --variant=v6 - - | - docker manifest annotate \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:i386-${REF}" \ - --os=linux \ - --arch=386 - - | - docker manifest push \ - "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" - tags: - - manifest - except: - - /^(?!master).+@/ - -# Generic publish template -.publish: &publish - stage: publish - image: - name: hassioaddons/repository-updater:latest - entrypoint: [""] - script: - - | - repository-updater \ - --token "${GITHUB_TOKEN}" \ - --repository "${REPOSITORY}" \ - --addon "${ADDON_GITHUB_REPO}" - tags: - - publish - except: - - /^(?!master).+@/ - -# Preflight jobs -hadolint: - <<: *preflight - image: hadolint/hadolint:latest-debian - before_script: - - hadolint --version - script: - - hadolint "${ADDON_TARGET}/Dockerfile" - -shellcheck: - <<: *preflight - image: - name: koalaman/shellcheck-alpine:stable - entrypoint: [""] - before_script: - - shellcheck --version - - apk --no-cache add grep - - | - find . -type f -print0 | \ - xargs -0 sed -i 's:#!/usr/bin/with-contenv bash:#!/bin/bash:g' - script: - - | - for file in $(grep -IRl "#\!\(/usr/bin/env \|/bin/\)" --exclude-dir ".git" "${ADDON_TARGET}"); do - if ! shellcheck $file; then - export FAILED=1 - else - echo "$file OK" - fi - done - if [ "${FAILED}" = "1" ]; then - exit 1 - fi - -yamllint: - <<: *preflight - image: sdesbure/yamllint - before_script: - - yamllint --version - script: - - yamllint . - -jsonlint: - <<: *preflight - image: sahsu/docker-jsonlint - before_script: - - jsonlint --version || true - script: - - | - for file in $(find . -type f -name "*.json"); do - if ! jsonlint -q $file; then - export FAILED=1 - else - echo "$file OK" - fi - done - if [ "${FAILED}" = "1" ]; then - exit 1 - fi - -markdownlint: - <<: *preflight - image: - name: ruby:alpine - entrypoint: [""] - before_script: - - gem install mdl - - mdl --version - script: - - mdl --style all --warnings . - -# Build Jobs -build:armhf: - <<: *build - variables: - ADDON_ARCH: armhf - FROM: hassioaddons/base-armhf:2.3.0 - tags: - - build - - armhf - -build:aarch64: - <<: *build - variables: - ADDON_ARCH: aarch64 - FROM: hassioaddons/base-aarch64:2.3.0 - tags: - - build - - aarch64 - -build:i386: - <<: *build - variables: - ADDON_ARCH: i386 - FROM: hassioaddons/base-i386:2.3.0 - tags: - - build - - i386 - -build:amd64: - <<: *build - variables: - ADDON_ARCH: amd64 - FROM: hassioaddons/base-amd64:2.3.0 - tags: - - build - - amd64 - -# Scan jobs -clair:armhf: - <<: *scan - variables: - ADDON_ARCH: armhf - -clair:aarch64: - <<: *scan - variables: - ADDON_ARCH: aarch64 - -clair:i386: - <<: *scan - variables: - ADDON_ARCH: i386 - -clair:amd64: - <<: *scan - variables: - ADDON_ARCH: amd64 - -# Deploy jobs -deploy:armhf: - <<: *deploy - variables: - ADDON_ARCH: armhf - -deploy:aarch64: - <<: *deploy - variables: - ADDON_ARCH: aarch64 - -deploy:i386: - <<: *deploy - variables: - ADDON_ARCH: i386 - -deploy:amd64: - <<: *deploy - variables: - ADDON_ARCH: amd64 - -# Manifest jobs -manifest:sha: - <<: *manifest - only: - - master - -manifest:version: - <<: *manifest - variables: - TAG: "${CI_COMMIT_TAG}" - only: - - /^v\d+\.\d+\.\d+(?:-(?:beta|rc)(?:(?:(?:\+|\.)?[a-zA-Z0-9]+)*)?)?$/ - -manifest:stable: - <<: *manifest - variables: - TAG: latest - only: - - /^v\d+\.\d+\.\d+(?:(?:(?:\+|\.)?[a-zA-Z0-9]+)*)?$/ - -manifest:beta: - <<: *manifest - variables: - TAG: beta - only: - - /^v\d+\.\d+\.\d+(?:-(?:beta|rc)(?:(?:(?:\+|\.)?[a-zA-Z0-9]+)*)?)?$/ - -manifest:edge: - <<: *manifest - variables: - TAG: edge - only: - - master - -# Publish jobs -publish:stable: - <<: *publish - variables: - REPOSITORY: hassio-addons/repository - only: - - /^v\d+\.\d+\.\d+(?:(?:(?:\+|\.)?[a-zA-Z0-9]+)*)?$/ - environment: - name: stable - -publish:beta: - <<: *publish - variables: - REPOSITORY: hassio-addons/repository-beta - only: - - /^v\d+\.\d+\.\d+(?:-(?:beta|rc)(?:(?:(?:\+|\.)?[a-zA-Z0-9]+)*)?)?$/ - environment: - name: beta - -publish:edge: - <<: *publish - variables: - REPOSITORY: hassio-addons/repository-edge - only: - - master - environment: - name: edge + ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:2.3.1" + ADDON_AMD64_BASE: "hassioaddons/base-amd64:2.3.1" + ADDON_ARMHF_BASE: "hassioaddons/base-armhf:2.3.1" + ADDON_I386_BASE: "hassioaddons/base-i386:2.3.1"