Compare commits
83 Commits
c835707f34
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c0aa46189 | ||
| fdb29f7ecd | |||
|
|
e895dba7fa | ||
| b79cfc04bb | |||
| d8426376df | |||
| 863a1d1e78 | |||
| 9c40f9c81d | |||
| 6945ae801b | |||
| 5f373afd03 | |||
| 852e358932 | |||
| 6590f6175d | |||
| d8ffae4001 | |||
|
|
1e273874cc | ||
|
|
2664aeb4a6 | ||
|
|
6cb977006b | ||
| c4bcab4462 | |||
| 8179fe657a | |||
| 1a4badf0ab | |||
| f3eb9a5da2 | |||
| 59159235d2 | |||
| def3ac45c1 | |||
| 642f901d49 | |||
| 088cfcd32a | |||
| 3fdb253943 | |||
| 903ace975e | |||
| 78de2950e9 | |||
| cb9722f843 | |||
| d6dec18244 | |||
| 37e49b5dc1 | |||
| f3f6ebaeb2 | |||
| a929ac15cf | |||
| 5c8cdff151 | |||
| d8f2dfb985 | |||
| f27d4c3096 | |||
| 2db24593fc | |||
| 17f3d32aa5 | |||
| c6fe661a1c | |||
| ebbde3fd3a | |||
| 91a6548efb | |||
| bbf89c4a16 | |||
| a0f8532792 | |||
| 572c5f3ec9 | |||
| 49a6d1a6e7 | |||
| 9291427779 | |||
| 00b6642553 | |||
| 3b9eb54959 | |||
| a39b1340b2 | |||
| 420abdd4ff | |||
| edfffe85d3 | |||
| 12c016068c | |||
| 6465769013 | |||
| 848cd16f8e | |||
| 3a26c0b511 | |||
| 9a0ba4cf18 | |||
| af62c622bc | |||
| 2ca6787116 | |||
| 7e171f8358 | |||
| af7ce692df | |||
| 0203e2efc3 | |||
| b9baa06539 | |||
| 2c5d1de598 | |||
| ae212be0d4 | |||
| a3cd6fda2d | |||
| 72935db1f8 | |||
| d3cf031ef5 | |||
| 5b67ad4d20 | |||
| 9d6547e198 | |||
| 2052d04e0f | |||
| d27108d7e6 | |||
| ae47e23c52 | |||
| e146dc6ebf | |||
| 71556eb778 | |||
| 2c07e226f4 | |||
| 2dd1ab2ae6 | |||
| 2d387cd52a | |||
| b7d46e8c7c | |||
| e6a0367b3b | |||
| 29afdc344e | |||
| d2f5b58eda | |||
| 034d3fc96c | |||
| cb40b1fd4b | |||
| 2928ec8f5a | |||
| 2069b0c6a1 |
@@ -371,11 +371,27 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
git config --local user.email "action@pi-farm.de"
|
git config --local user.email "action@pi-farm.de"
|
||||||
git config --local user.name "Gitea Action"
|
git config --local user.name "Gitea Action"
|
||||||
|
|
||||||
|
# Sicherstellen, dass wir etwas zum Committen haben
|
||||||
git add VERSION.history README.md docker-compose.yml
|
git add VERSION.history README.md docker-compose.yml
|
||||||
|
|
||||||
|
# Nur committen, wenn es Änderungen gibt
|
||||||
git diff --quiet && git diff --staged --quiet || git commit -m "${{ env.FINAL_MSG }} [skip ci]"
|
git diff --quiet && git diff --staged --quiet || git commit -m "${{ env.FINAL_MSG }} [skip ci]"
|
||||||
git tag -f "v${{ steps.prep.outputs.docker_tag }}"
|
|
||||||
git push origin main
|
# Das Tag exakt so setzen, wie es in prep definiert wurde (ohne extra 'v')
|
||||||
git push -f origin "v${{ steps.prep.outputs.docker_tag }}"
|
TARGET_TAG="${{ steps.prep.outputs.docker_tag }}"
|
||||||
|
git tag -f "$TARGET_TAG"
|
||||||
|
|
||||||
|
if [[ "${{ gitea.ref }}" == refs/tags/* ]]; then
|
||||||
|
echo "🏷️ Build aus Tag getriggert: $TARGET_TAG"
|
||||||
|
# Wir pushen das Tag (force), um die Doku-Updates einzuschließen
|
||||||
|
git push -f origin "$TARGET_TAG"
|
||||||
|
else
|
||||||
|
echo "🌿 Build aus Branch/Schedule getriggert: ${{ gitea.ref_name }}"
|
||||||
|
# In den Branch pushen (HEAD:branch_name) und das Tag setzen
|
||||||
|
git push origin HEAD:${{ gitea.ref_name }}
|
||||||
|
git push -f origin "$TARGET_TAG"
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Cleanup Temporary Tags on Docker Hub
|
- name: Cleanup Temporary Tags on Docker Hub
|
||||||
if: steps.check_changes.outputs.should_build == 'true' && contains(steps.prep.outputs.push_targets, 'dockerhub')
|
if: steps.check_changes.outputs.should_build == 'true' && contains(steps.prep.outputs.push_targets, 'dockerhub')
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -17,3 +17,6 @@ data/*
|
|||||||
# solltest du sie hier ebenfalls ausschließen:
|
# solltest du sie hier ebenfalls ausschließen:
|
||||||
config/*
|
config/*
|
||||||
!config/.gitkeep
|
!config/.gitkeep
|
||||||
|
|
||||||
|
# VS-Code spezifisch
|
||||||
|
.vscode/
|
||||||
|
|||||||
49
Dockerfile
49
Dockerfile
@@ -1,27 +1,34 @@
|
|||||||
# Example Dockerfile for amd64
|
ARG BUILD_BASE_IMAGE
|
||||||
ARG BASE_IMAGE=alpine:latest
|
ARG BUILD_RUNTIME_IMAGE
|
||||||
|
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||||
|
|
||||||
FROM ${BASE_IMAGE}
|
ARG BUILD_TAG
|
||||||
|
ARG BUILD_MAINTAINER
|
||||||
|
ARG BUILD_TZ
|
||||||
|
ARG BUILD_APP_NAME
|
||||||
|
ARG BUILD_APP_USER
|
||||||
|
ARG BUILD_APP_GIT
|
||||||
|
ARG ENV_TZ
|
||||||
|
|
||||||
ARG MAINTAINER
|
LABEL maintainer="${BUILD_MAINTAINER}"
|
||||||
ARG TZ
|
LABEL org.opencontainers.image.title="${BUILD_APP_NAME}"
|
||||||
ARG APP_NAME
|
|
||||||
ARG APP_USER
|
|
||||||
|
|
||||||
LABEL maintainer="${MAINTAINER}"
|
ENV TZ=${ENV_TZ}
|
||||||
LABEL org.opencontainers.image.title="${APP_NAME}"
|
|
||||||
|
|
||||||
ENV TZ=${TZ}
|
RUN apt update && \
|
||||||
ENV USER=${APP_USER}
|
apt install -y git build-essential cmake curl ninja-build ccache git libcurl4-openssl-dev libevent-dev ruby libtbb-dev && \
|
||||||
|
git clone ${BUILD_APP_GIT} /app/hibp && \
|
||||||
|
cd /app/hibp && \
|
||||||
|
git submodule update --init --recursive && \
|
||||||
|
cd ext/restinio && \
|
||||||
|
gem install Mxx_ru && \
|
||||||
|
mxxruexternals && \
|
||||||
|
cd ../.. && \
|
||||||
|
./build.sh -c gcc -b release
|
||||||
|
|
||||||
RUN apk add --no-cache tzdata ca-certificates
|
FROM ${BUILD_RUNTIME_IMAGE}
|
||||||
|
|
||||||
WORKDIR /app
|
COPY --from=builder /app/hibp/build/gcc/release/* /usr/local/bin/
|
||||||
COPY ./config /app/config
|
COPY root/ /
|
||||||
COPY ./data /app/data
|
VOLUME /data
|
||||||
|
EXPOSE 8082
|
||||||
RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app
|
|
||||||
|
|
||||||
USER ${APP_USER}
|
|
||||||
|
|
||||||
CMD ["sh"]
|
|
||||||
@@ -1,27 +1,34 @@
|
|||||||
# Example Dockerfile for arm64
|
ARG BUILD_BASE_IMAGE
|
||||||
ARG BASE_IMAGE=alpine:latest
|
ARG BUILD_RUNTIME_IMAGE
|
||||||
|
FROM ${BUILD_BASE_IMAGE} AS builder
|
||||||
|
|
||||||
FROM ${BASE_IMAGE}
|
ARG BUILD_TAG
|
||||||
|
ARG BUILD_MAINTAINER
|
||||||
|
ARG BUILD_TZ
|
||||||
|
ARG BUILD_APP_NAME
|
||||||
|
ARG BUILD_APP_USER
|
||||||
|
ARG BUILD_APP_GIT
|
||||||
|
ARG ENV_TZ
|
||||||
|
|
||||||
ARG MAINTAINER
|
LABEL maintainer="${BUILD_MAINTAINER}"
|
||||||
ARG TZ
|
LABEL org.opencontainers.image.title="${BUILD_APP_NAME}"
|
||||||
ARG APP_NAME
|
|
||||||
ARG APP_USER
|
|
||||||
|
|
||||||
LABEL maintainer="${MAINTAINER}"
|
ENV TZ=${ENV_TZ}
|
||||||
LABEL org.opencontainers.image.title="${APP_NAME}"
|
|
||||||
|
|
||||||
ENV TZ=${TZ}
|
RUN apt update && \
|
||||||
ENV USER=${APP_USER}
|
apt install -y git build-essential cmake curl ninja-build ccache git libcurl4-openssl-dev libevent-dev ruby libtbb-dev && \
|
||||||
|
git clone ${BUILD_APP_GIT} /app/hibp && \
|
||||||
|
cd /app/hibp && \
|
||||||
|
git submodule update --init --recursive && \
|
||||||
|
cd ext/restinio && \
|
||||||
|
gem install Mxx_ru && \
|
||||||
|
mxxruexternals && \
|
||||||
|
cd ../.. && \
|
||||||
|
./build.sh -c gcc -b release
|
||||||
|
|
||||||
RUN apk add --no-cache tzdata ca-certificates
|
FROM ${BUILD_RUNTIME_IMAGE}
|
||||||
|
|
||||||
WORKDIR /app
|
COPY --from=builder /app/hibp/build/gcc/release/* /usr/local/bin/
|
||||||
COPY ./config /app/config
|
COPY root/ /
|
||||||
COPY ./data /app/data
|
VOLUME /data
|
||||||
|
EXPOSE 8082
|
||||||
RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app
|
|
||||||
|
|
||||||
USER ${APP_USER}
|
|
||||||
|
|
||||||
CMD ["sh"]
|
|
||||||
59
README.md
59
README.md
@@ -1,16 +1,55 @@
|
|||||||
# Projekt: {{.RepoName}} [](https://git.pi-farm.de/{{.Owner.Name}}/{{.RepoName}}/actions)
|
# hibp-docker
|
||||||
|
Docker implementation of https://github.com/oschonrock/hibp.git.
|
||||||
|
|
||||||
|
[](https://git.pi-farm.de/pi-farm/hibp-docker/actions)
|
||||||
|
[](__REPO_URL__)
|
||||||
|
|
||||||
This repository is built and pushed automatically.
|
This repository is built and pushed automatically.
|
||||||
|
|
||||||
### 🏗️ Platform Support
|
|
||||||
| Architecture | Status | Base-Image |
|
|
||||||
| :--- | :--- | :--- |
|
|
||||||
| **x86_64** (amd64) | ✅ Active | `__BASE_IMAGE__` |
|
|
||||||
| **aarch64** (arm64) | __ARM_STATUS__ | `__BASE_IMAGE__` |
|
|
||||||
|
|
||||||
### 🚀 Docker Pull Command
|
|
||||||
|
### 🏗️ Platform Support
|
||||||
|
| Architecture | Status | Base Image | Build Date |
|
||||||
|
| :--- | :--- | :--- | :--- |
|
||||||
|
| x86_64 (amd64) | ✅ Active | git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim | 25.03.2026 10:29 |
|
||||||
|
| aarch64 (arm64) | ✅ Active | git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim | 25.03.2026 10:29 |
|
||||||
|
|
||||||
|
### 🚀 Docker Pull
|
||||||
```bash
|
```bash
|
||||||
docker pull git.pi-farm.de/{{.Owner.Name}}/{{.RepoName}}:latest
|
docker pull git.pi-farm.de/pi-farm/hibp-docker:0.6.2
|
||||||
```
|
```
|
||||||
---
|
### 🚀 Docker Compose
|
||||||
*Last updated on: __DATE__*
|
```yaml
|
||||||
|
services:
|
||||||
|
hibp-docker:
|
||||||
|
image: git.pi-farm.de/pi-farm/hibp-docker:0.6.2
|
||||||
|
container_name: hibp-docker
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- 8082:8082
|
||||||
|
environment:
|
||||||
|
- TZ=Europe/Berlin
|
||||||
|
- PUID=1000
|
||||||
|
- PGID=1000
|
||||||
|
volumes:
|
||||||
|
- /data
|
||||||
|
```
|
||||||
|
### 🚀 Docker Run
|
||||||
|
```bash
|
||||||
|
docker run -d \
|
||||||
|
--name hibp-docker \
|
||||||
|
--restart unless-stopped \
|
||||||
|
-e TZ=Europe/Berlin \
|
||||||
|
-e PUID=1000 \
|
||||||
|
-e PGID=1000 \
|
||||||
|
-v /data \
|
||||||
|
-p 8082:8082 \
|
||||||
|
git.pi-farm.de/pi-farm/hibp-docker:0.6.2
|
||||||
|
```
|
||||||
|
|
||||||
|
*Last updated on: 25.03.2026 10:29*
|
||||||
|
|
||||||
|
### 📜 Version History
|
||||||
|
| Version | Date | Status |
|
||||||
|
| :--- | :--- | :--- |
|
||||||
|
| **0.6.2** | 25.03.2026 10:29 | ✅ |
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
| **0.6.2** | 25.03.2026 10:29 | ✅ |
|
||||||
|
|||||||
@@ -1,26 +1,21 @@
|
|||||||
## BUILD STAGE
|
## BUILD STAGE
|
||||||
BUILD_TAG=1.00
|
BUILD_TAG=0.6.2
|
||||||
BUILD_BASE_IMAGE=alpine:${BUILD_TAG}
|
BUILD_TAG_LATEST=n
|
||||||
## Examples for BUILD_BASE_IMAGE
|
BUILD_BASE_IMAGE=git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim
|
||||||
# alpine:${BUILD_TAG}
|
BUILD_RUNTIME_IMAGE=git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim
|
||||||
# git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG}
|
BUILD_MAINTAINER=pi-farm
|
||||||
#BUILD_ALPINE_ARCH_AMD64=x86_64
|
BUILD_APP_VERSION=${BUILD_TAG}
|
||||||
#BUILD_ALPINE_ARCH_AARCH64=aarch64
|
BUILD_APP_GIT=https://github.com/oschonrock/hibp.git
|
||||||
#BUILD_S6_ARCH_amd64=x86_64
|
BUILD_APP_NAME=hibp
|
||||||
#BUILD_S6_ARCH_aarch64=aarch64
|
BUILD_APP_USER=pi
|
||||||
#BUILD_S6_OVERLAY_VERSION=3.2.0.2
|
BUILD_APP_GID=1000
|
||||||
#BUILD_MAINTAINER=pi-farm
|
|
||||||
#BUILD_APP_VERSION=v${BUILD_TAG}
|
|
||||||
#BUILD_APP_NAME=basimage-alpine
|
|
||||||
#BUILD_APP_USER=pi
|
|
||||||
#BUILD_APP_GID=1000
|
|
||||||
## ENV STAGE
|
## ENV STAGE
|
||||||
ENV_TZ=Europe/Berlin
|
ENV_TZ=Europe/Berlin
|
||||||
ENV_PUID=1000
|
ENV_PUID=1000
|
||||||
ENV_PGID=1000
|
ENV_PGID=1000
|
||||||
# VOL_CONFIG=./config:/config
|
VOL_DATA=/data
|
||||||
# VOL_DATA=./data:/data
|
PORT_WEB=8082:8082
|
||||||
# PORT_WEB=8080:80
|
PUSH=gitea
|
||||||
#PUSH=gitea,dockerhub
|
#,dockerhub
|
||||||
DESCRIPTION="Example example example"
|
DESCRIPTION="Docker implementation of https://github.com/oschonrock/hibp.git."
|
||||||
|
|
||||||
@@ -1 +1,13 @@
|
|||||||
|
services:
|
||||||
|
hibp-docker:
|
||||||
|
image: git.pi-farm.de/pi-farm/hibp-docker:0.6.2
|
||||||
|
container_name: hibp-docker
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- 8082:8082
|
||||||
|
environment:
|
||||||
|
- TZ=Europe/Berlin
|
||||||
|
- PUID=1000
|
||||||
|
- PGID=1000
|
||||||
|
volumes:
|
||||||
|
- /data
|
||||||
|
|||||||
15
root/etc/s6-overlay/s6-rc.d/init-hibp/run
Executable file
15
root/etc/s6-overlay/s6-rc.d/init-hibp/run
Executable file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
echo "Start: init-hibp run script"
|
||||||
|
|
||||||
|
mkdir -p /data
|
||||||
|
|
||||||
|
if [ ! -f /data/*.bin ]; then
|
||||||
|
echo "Downloading /data/hibp_all.sha1.bin"
|
||||||
|
hibp-download /data/hibp_all.sha1.bin
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Set permissions to PUID: ${PUID:-911} and PGID: ${PGID:-1000}"
|
||||||
|
chown -R "${PUID:-911}:${PGID:-1000}" /data
|
||||||
|
|
||||||
|
echo "Finish: init-hibp"
|
||||||
1
root/etc/s6-overlay/s6-rc.d/init-hibp/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-hibp/type
Normal file
@@ -0,0 +1 @@
|
|||||||
|
oneshot
|
||||||
1
root/etc/s6-overlay/s6-rc.d/init-hibp/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-hibp/up
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/etc/s6-overlay/s6-rc.d/init-hibp/run
|
||||||
3
root/etc/s6-overlay/s6-rc.d/svc-hibp/run
Executable file
3
root/etc/s6-overlay/s6-rc.d/svc-hibp/run
Executable file
@@ -0,0 +1,3 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
exec hibp-server --bind-address=0.0.0.0 --sha1-db=/data/hibp_all.sha1.bin
|
||||||
1
root/etc/s6-overlay/s6-rc.d/svc-hibp/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-hibp/type
Normal file
@@ -0,0 +1 @@
|
|||||||
|
longrun
|
||||||
Reference in New Issue
Block a user