6 Commits

Author SHA1 Message Date
e09df09c87 version bump
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2022-06-13 00:35:09 +02:00
596b7d37b1 multiarch image
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-13 00:29:25 +02:00
ddba94f72d placeholder for arm arch 2022-06-13 00:23:25 +02:00
7309257569 added arm64
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-13 00:14:03 +02:00
27a52b53e4 separated amd64 arch and updated base image
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-13 00:07:32 +02:00
858b937272 fix drone
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2021-10-12 15:06:58 +02:00
6 changed files with 192 additions and 9 deletions

View File

@@ -1,22 +1,158 @@
kind: pipeline kind: pipeline
type: docker type: docker
name: default name: build-amd64
platform:
arch: amd64
os: linux
steps: steps:
- name: build
image: plugins/docker:linux-amd64
settings:
dockerfile: Dockerfile.amd64
dry_run: true
repo: docker.asperti.com/paspo/hassio-zabbix-agent2
when:
event:
- push
- name: build_and_publish - name: build_and_publish
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
settings: settings:
dockerfile: Dockerfile.amd64
password: password:
from_secret: docker_password from_secret: docker_password
registry: docker.asperti.com registry: docker.asperti.com
repo: docker.asperti.com/paspo/hassio-zabbix-agent2 repo: docker.asperti.com/paspo/hassio-zabbix-agent2
tags: tags:
- latest - latest-amd64
- 0.1.2 - ${DRONE_TAG}-amd64
- ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-amd64
username: username:
from_secret: docker_username from_secret: docker_username
when:
event:
- tag
trigger: trigger:
event: event:
- tag - tag
- push - push
---
kind: pipeline
type: docker
name: build-arm64
platform:
arch: arm64
os: linux
steps:
- name: build
image: plugins/docker:linux-arm64
settings:
dockerfile: Dockerfile.arm64
dry_run: true
repo: docker.asperti.com/paspo/hassio-zabbix-agent2
when:
event:
- push
- name: build_and_publish
image: plugins/docker:linux-arm64
settings:
dockerfile: Dockerfile.arm64
password:
from_secret: docker_password
registry: docker.asperti.com
repo: docker.asperti.com/paspo/hassio-zabbix-agent2
tags:
- latest-arm64
- ${DRONE_TAG}-arm64
- ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-arm64
username:
from_secret: docker_username
when:
event:
- tag
trigger:
event:
- tag
- push
# ---
# kind: pipeline
# type: docker
# name: build-arm
# platform:
# arch: arm
# os: linux
# steps:
# - name: build
# image: plugins/docker:linux-arm
# settings:
# dockerfile: Dockerfile.arm
# dry_run: true
# repo: docker.asperti.com/paspo/hassio-zabbix-agent2
# when:
# event:
# - push
# - name: build_and_publish
# image: plugins/docker:linux-arm
# settings:
# dockerfile: Dockerfile.arm
# password:
# from_secret: docker_password
# registry: docker.asperti.com
# repo: docker.asperti.com/paspo/hassio-zabbix-agent2
# tags:
# - latest-arm
# - ${DRONE_TAG}-arm
# - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-arm
# username:
# from_secret: docker_username
# when:
# event:
# - tag
# trigger:
# event:
# - tag
# - push
---
kind: pipeline
type: docker
name: manifest
steps:
- name: manifest
image: plugins/manifest
settings:
force_tag: true
ignore_missing: true
spec: manifest.tmpl
username:
from_secret: docker_username
password:
from_secret: docker_password
tags:
- latest
- ${DRONE_TAG}
- ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
- ${DRONE_SEMVER_MAJOR}
trigger:
event:
- tag
depends_on:
- build-amd64
- build-arm64
# - build-arm

View File

@@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:8.0.6 ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
FROM $BUILD_FROM FROM $BUILD_FROM
ENV LANG C.UTF-8 ENV LANG C.UTF-8
@@ -6,7 +6,7 @@ ENV LANG C.UTF-8
# Copy scripts for add-on # Copy scripts for add-on
COPY run.sh / COPY run.sh /
RUN apk add -U jq zabbix-agent2=5.0.14-r1 sudo && \ RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
chmod a+x /run.sh chmod a+x /run.sh
CMD [ "/run.sh" ] CMD [ "/run.sh" ]

12
Dockerfile.arm Normal file
View File

@@ -0,0 +1,12 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base/armhf:12.0.0
FROM $BUILD_FROM
ENV LANG C.UTF-8
# Copy scripts for add-on
COPY run.sh /
RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
chmod a+x /run.sh
CMD [ "/run.sh" ]

12
Dockerfile.arm64 Normal file
View File

@@ -0,0 +1,12 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base/aarch64:12.0.0
FROM $BUILD_FROM
ENV LANG C.UTF-8
# Copy scripts for add-on
COPY run.sh /
RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
chmod a+x /run.sh
CMD [ "/run.sh" ]

View File

@@ -2,7 +2,7 @@
"name": "Zabbix Agent 2", "name": "Zabbix Agent 2",
"url": "https://git.asperti.com/paspo/hassio-addons", "url": "https://git.asperti.com/paspo/hassio-addons",
"image": "docker.asperti.com/paspo/hassio-zabbix-agent2", "image": "docker.asperti.com/paspo/hassio-zabbix-agent2",
"version": "0.1.3", "version": "0.2.0",
"slug": "zabbix-agent2", "slug": "zabbix-agent2",
"description": "Zabbix Agent 2 for hass.io", "description": "Zabbix Agent 2 for hass.io",
"startup": "services", "startup": "services",
@@ -12,9 +12,7 @@
"gpio": false, "gpio": false,
"arch": [ "arch": [
"aarch64", "aarch64",
"amd64", "amd64"
"armhf",
"i386"
], ],
"ports": { "ports": {
"10050/tcp": 10050 "10050/tcp": 10050

25
manifest.tmpl Normal file
View File

@@ -0,0 +1,25 @@
image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
{{#if build.tags}}
tags:
{{#each build.tags}}
- {{this}}
{{/each}}
{{/if}}
manifests:
-
image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
platform:
architecture: amd64
os: linux
-
image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
platform:
variant: v8
architecture: arm64
os: linux
-
image: docker.asperti.com/paspo/hassio-zabbix-agent2:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
platform:
variant: v7
architecture: arm
os: linux