Skip to content

Commit

Permalink
Issue #119 fix nut-upsd healthcheck, update SSL libs (#141)
Browse files Browse the repository at this point in the history
* Issue #119 fix nut-upsd healthcheck, update SSL libs

* wip
  • Loading branch information
instantlinux committed Dec 12, 2023
1 parent b818bd8 commit 6a31ab4
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 13 deletions.
4 changes: 2 additions & 2 deletions images/git-dump/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18
FROM alpine:3.19
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -18,7 +18,7 @@ ENV API_TOKEN_SECRET= \
USERNAME=git-dump \
TZ=UTC

ARG GIT_VERSION=2.40.1-r0
ARG GIT_VERSION=2.43.0-r0
ARG GROUP=care
ARG GID=505
ARG UID=212
Expand Down
4 changes: 2 additions & 2 deletions images/git-dump/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
sources:
- https://github.com/instantlinux/docker-tools
type: application
version: 0.1.11
appVersion: "2.40.1-r0"
version: 0.1.12
appVersion: "2.43.0-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 2 additions & 2 deletions images/git-pull/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18
FROM alpine:3.19
MAINTAINER Rich Braun <[email protected]>
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools

ARG GIT_VERSION=2.40.1-r0
ARG GIT_VERSION=2.43.0-r0
ENV DEST=. \
GIT_COMMIT=master \
GIT_HOST=github.com \
Expand Down
4 changes: 2 additions & 2 deletions images/git-pull/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
sources:
- https://github.com/instantlinux/docker-tools
type: application
version: 0.1.9
appVersion: "2.40.1-r0"
version: 0.1.10
appVersion: "2.43.0-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
6 changes: 3 additions & 3 deletions images/nut-upsd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18
FROM alpine:3.19
MAINTAINER Rich Braun "[email protected]"
ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -7,7 +7,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=nut-upsd \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
ARG NUT_VERSION=2.8.0-r4
ARG NUT_VERSION=2.8.1-r0
ENV API_USER=upsmon \
API_PASSWORD= \
DESCRIPTION=UPS \
Expand All @@ -25,7 +25,7 @@ ENV API_USER=upsmon \
HEALTHCHECK CMD upsc $NAME@localhost:3493 2>&1|grep -q stale && exit 1 || true

RUN apk add --update nut=$NUT_VERSION \
libcrypto1.1 libssl1.1 libusb musl net-snmp-libs
libcrypto3 libssl3 libusb musl net-snmp-libs

EXPOSE 3493
COPY entrypoint.sh /usr/local/bin/
Expand Down
4 changes: 2 additions & 2 deletions images/nut-upsd/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ sources:
- https://github.com/instantlinux/docker-tools
- https://github.com/networkupstools/nut
type: application
version: 0.1.4
appVersion: "2.8.0-r4"
version: 0.1.5
appVersion: "2.8.1-r0"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
7 changes: 7 additions & 0 deletions images/nut-upsd/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ deployment:
privileged: true
strategy:
type: Recreate
livenessProbe:
exec:
command:
- /bin/sh
- -c
- 'upsc ups@localhost:3493 2>&1|grep -q stale && exit 1 || true'
periodSeconds: 30
volumeMounts:
# TODO make this work with pod security policies instead of securityContext
# - name: usb
Expand Down

0 comments on commit 6a31ab4

Please sign in to comment.