Compare commits

..

12 Commits

Author SHA1 Message Date
c64a359255 first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 16:06:05 +02:00
865e3fbca0 first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 16:01:07 +02:00
b94fbc891a first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 15:57:21 +02:00
a872c40919 first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 15:12:35 +02:00
de5072b5af first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 15:08:53 +02:00
5601c25ea4 first commit
Some checks failed
continuous-integration/drone/push Build is failing
2022-05-15 15:08:17 +02:00
304e970a5e first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 14:35:31 +02:00
3edfa6e50b first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 14:22:41 +02:00
98ad197a05 first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 14:21:37 +02:00
f54a766829 first commit
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-15 14:13:02 +02:00
8defedbae8 first commit 2022-05-15 14:11:31 +02:00
81d209778a first commit 2022-05-15 14:11:22 +02:00
7 changed files with 52 additions and 21 deletions

16
.drone.yml Normal file
View File

@ -0,0 +1,16 @@
kind: pipeline
name: default
steps:
- name: Uploading to DockerHub
image: plugins/docker
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: sthopeless/temp2mqtt
tags: latest
purge: true
dockerfile: Dockerfile_x86_64

View File

@ -1,14 +0,0 @@
FROM alpine:latest
#
ARG PUID=1000
ARG PGID=1000
#
RUN set -xe \
&& addgroup -g ${PGID} -S mosquitto \
&& adduser -u ${PUID} -G mosquitto -h /mosquitto/ -D mosquitto \
&& apk add --no-cache --purge -uU mosquitto mosquitto-libs mosquitto-clients
WORKDIR /workspace
COPY root/defaults/temp2mqtt /workspace
CMD [ "sh", "./temp2mqtt" ]

28
Dockerfile_x86_64 Normal file
View File

@ -0,0 +1,28 @@
FROM alpine:latest
ARG S6_OVERLAY_VERSION=3.1.0.1
LABEL org.opencontainers.image.source="https://git.sthope.dev/sthope/DockerContainer-randomPwd"
LABEL Maintainer="Sthope"
LABEL Description="Send CPU Temp via MQTT"
LABEL version="1.0.0"
ARG PUID=1000
ARG PGID=1000
RUN set -xe \
&& addgroup -g ${PGID} -S mosquitto \
&& adduser -u ${PUID} -G mosquitto -h /mosquitto/ -D mosquitto \
&& apk add --no-cache --purge -uU mosquitto mosquitto-libs mosquitto-clients
WORKDIR /config
# COPY root/defaults/temp2mqtt /config
CMD [ "sh", "/config/temp2mqtt" ]
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
ENTRYPOINT ["/init"]

View File

@ -1,2 +1,3 @@
# DockerContainer-SendTemp2MQTT
[![Build Status](https://drone.sthope.dev/api/badges/sthope/DockerContainer-SendTemp2MQTT/status.svg)](https://git.sthope.dev/sthope/DockerContainer-SendTemp2MQTT)

View File

@ -8,7 +8,7 @@ services:
environment:
- PGID=1000
- PUID=1000
- PROXMOX_NAME=Icecrown
- PROXMOX_NAME=proxmox_name
- MQTT_BROKER=mqtt_ip
- USERNAME=mqtt_username
- PASSWORD=mqtt_password

View File

@ -7,8 +7,8 @@ PROXMOX_NAME="${PROXMOX_NAME:-pve}";
TEMP=$(clear;sensors | sed -n 9p | sed 's/^[^=:]*[=:]//' | sed -r 's/\s+//g');
[[ ! -f /mosquitto/config/temp2mqtt ]] && touch /mosquitto/config/temp2mqtt;
cat <<EOF >> /mosquitto/config/temp2mqtt
[[ ! -f /config/temp2mqtt ]] && touch /config/temp2mqtt;
cat <<EOF >> /config/temp2mqtt
#!/bin/bash
# ___ _ _ _ __
# / __|| |_ | |_ ___ | '_ \ ___
@ -25,5 +25,5 @@ TEMP=$(clear;sensors | sed -n 9p | sed 's/^[^=:]*[=:]//' | sed -r 's/\s+//g');
mosquitto_pub -h "${MQTT_BROKER}" -u "${USERNAME}" -P "${PASSWORD}" -t proxmox/"${PROXMOX_NAME}"/cpu_temp -m "${TEMP}"
EOF
chown -R mosquitto:mosquitto /mosquitto/;
chmod +x /mosquitto/config/temp2mqtt;
chown -R mosquitto:mosquitto /config/temp2mqtt;
chmod +x /config/temp2mqtt;

View File

@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash
cd /mosquitto/config || exit 1;
cd /config/ || exit 1;
while /mosquitto/config/temp2mqtt; do sleep 10; done
while /config/temp2mqtt; do sleep 10; done