Compare commits
85 Commits
c835707f34
...
0.6.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3b85f28622 | ||
|
|
f9ee5f5cf5 | ||
|
|
a7bc6631d3 | ||
| b6cf806444 | |||
|
|
29583fec3b | ||
| 899f7ef4ec | |||
| a9b2ae05e4 | |||
| 9327f7afda | |||
| 1da4fbd426 | |||
| 08d2915f2f | |||
| 3a7a942587 | |||
| 5b9519bf7a | |||
| 5d384a1f28 | |||
| 31cef0c000 | |||
|
|
577dbdf2ea | ||
|
|
c21d849c96 | ||
|
|
3fb26f056c | ||
| 57c5b25712 | |||
| 1601b94c3a | |||
| acd76cd5b4 | |||
| 33fe45387b | |||
| 2943603ba3 | |||
| c2c7375a43 | |||
| 0b9bfb9e5d | |||
| 62c96bac29 | |||
| 6ef8352ef2 | |||
| b8fc48a1a5 | |||
| cd8421754d | |||
| 4972b2d141 | |||
| b3dae6df41 | |||
| a28043c343 | |||
| c1f97080ac | |||
| 390b6234e5 | |||
| c79c1b694b | |||
| 6bd1ee9013 | |||
| 3b234064b0 | |||
| 73508e6ef8 | |||
| dca64875a4 | |||
| 68f7c66982 | |||
| 08a4e7a496 | |||
| 69cafebf26 | |||
| 9e42d30b3c | |||
| 7594f49351 | |||
| 5b6aa5d80e | |||
| f70b77f7c0 | |||
| b99fd90482 | |||
| 96a4e4f1f4 | |||
| 0fd8882e5d | |||
| e9fd901a98 | |||
| 3d7cd77d7b | |||
| a2f466c634 | |||
| 2e4f8c8bab | |||
| 177cb3fd57 | |||
| dfc76ccdc3 | |||
| 2c0259c464 | |||
| f5f2311747 | |||
| ec51105993 | |||
| bd4df383ea | |||
| d69bc3b0c1 | |||
| d5ee1be676 | |||
| 6a85b5e957 | |||
| 9279383cda | |||
| 44d4fed72a | |||
| 96e42a01fe | |||
| 84d989bfc4 | |||
| 237dcacf23 | |||
| 1a5af72b3e | |||
| 46e02d3f35 | |||
| a18ebec833 | |||
| a985148381 | |||
| e909046eb1 | |||
| 734ec636bb | |||
| 1db8f5b6a9 | |||
| d5a03ba88c | |||
| 8bf3df700c | |||
| 95a1e3adbd | |||
| 5d0d1bca9a | |||
| de58405ccd | |||
| 59ca58df24 | |||
| d72b750b69 | |||
| 3f9937787c | |||
| 6cfaba5bc0 | |||
| e0b5789405 | |||
| 9fda27e9e4 | |||
| da44f3594e |
@@ -371,11 +371,27 @@ jobs:
|
||||
run: |
|
||||
git config --local user.email "action@pi-farm.de"
|
||||
git config --local user.name "Gitea Action"
|
||||
|
||||
# Sicherstellen, dass wir etwas zum Committen haben
|
||||
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 tag -f "v${{ steps.prep.outputs.docker_tag }}"
|
||||
git push origin main
|
||||
git push -f origin "v${{ steps.prep.outputs.docker_tag }}"
|
||||
|
||||
# Das Tag exakt so setzen, wie es in prep definiert wurde (ohne extra 'v')
|
||||
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
|
||||
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:
|
||||
config/*
|
||||
!config/.gitkeep
|
||||
|
||||
# VSCode spezifisch
|
||||
.vscode/
|
||||
49
Dockerfile
49
Dockerfile
@@ -1,27 +1,34 @@
|
||||
# Example Dockerfile for amd64
|
||||
ARG BASE_IMAGE=alpine:latest
|
||||
ARG BUILD_BASE_IMAGE
|
||||
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
|
||||
ARG TZ
|
||||
ARG APP_NAME
|
||||
ARG APP_USER
|
||||
LABEL maintainer="${BUILD_MAINTAINER}"
|
||||
LABEL org.opencontainers.image.title="${BUILD_APP_NAME}"
|
||||
|
||||
LABEL maintainer="${MAINTAINER}"
|
||||
LABEL org.opencontainers.image.title="${APP_NAME}"
|
||||
ENV TZ=${ENV_TZ}
|
||||
|
||||
ENV TZ=${TZ}
|
||||
ENV USER=${APP_USER}
|
||||
RUN apt update && \
|
||||
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 ./config /app/config
|
||||
COPY ./data /app/data
|
||||
|
||||
RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app
|
||||
|
||||
USER ${APP_USER}
|
||||
|
||||
CMD ["sh"]
|
||||
COPY --from=builder /app/hibp/build/gcc/release/* /usr/local/bin/
|
||||
COPY root/ /
|
||||
VOLUME /data
|
||||
EXPOSE 8082
|
||||
@@ -1,27 +1,34 @@
|
||||
# Example Dockerfile for arm64
|
||||
ARG BASE_IMAGE=alpine:latest
|
||||
ARG BUILD_BASE_IMAGE
|
||||
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
|
||||
ARG TZ
|
||||
ARG APP_NAME
|
||||
ARG APP_USER
|
||||
LABEL maintainer="${BUILD_MAINTAINER}"
|
||||
LABEL org.opencontainers.image.title="${BUILD_APP_NAME}"
|
||||
|
||||
LABEL maintainer="${MAINTAINER}"
|
||||
LABEL org.opencontainers.image.title="${APP_NAME}"
|
||||
ENV TZ=${ENV_TZ}
|
||||
|
||||
ENV TZ=${TZ}
|
||||
ENV USER=${APP_USER}
|
||||
RUN apt update && \
|
||||
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 ./config /app/config
|
||||
COPY ./data /app/data
|
||||
|
||||
RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app
|
||||
|
||||
USER ${APP_USER}
|
||||
|
||||
CMD ["sh"]
|
||||
COPY --from=builder /app/hibp/build/gcc/release/* /usr/local/bin/
|
||||
COPY root/ /
|
||||
VOLUME /data
|
||||
EXPOSE 8082
|
||||
61
README.md
61
README.md
@@ -1,16 +1,57 @@
|
||||
# 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.
|
||||
|
||||
### 🏗️ 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 | 29.03.2026 01:41 |
|
||||
| aarch64 (arm64) | ✅ Active | git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim | 29.03.2026 01:41 |
|
||||
|
||||
### 🚀 Docker Pull
|
||||
```bash
|
||||
docker pull git.pi-farm.de/{{.Owner.Name}}/{{.RepoName}}:latest
|
||||
docker pull git.pi-farm.de/pi-farm/hibp-docker:0.6.2
|
||||
```
|
||||
---
|
||||
*Last updated on: __DATE__*
|
||||
### 🚀 Docker Compose
|
||||
```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: 29.03.2026 01:41*
|
||||
|
||||
### 📜 Version History
|
||||
| Version | Date | Status |
|
||||
| :--- | :--- | :--- |
|
||||
| **0.6.2** | 29.03.2026 01:41 | add .vscode ✅ |
|
||||
| **0.6.2** | 25.03.2026 11:13 | buildargs.env aktualisiert ✅ |
|
||||
| **0.6.2** | 25.03.2026 10:29 | ✅ |
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
| **0.6.2** | 29.03.2026 01:41 | add .vscode ✅ |
|
||||
| **0.6.2** | 25.03.2026 11:13 | buildargs.env aktualisiert ✅ |
|
||||
| **0.6.2** | 25.03.2026 10:29 | ✅ |
|
||||
|
||||
@@ -1,26 +1,21 @@
|
||||
## BUILD STAGE
|
||||
BUILD_TAG=1.00
|
||||
BUILD_BASE_IMAGE=alpine:${BUILD_TAG}
|
||||
## Examples for BUILD_BASE_IMAGE
|
||||
# alpine:${BUILD_TAG}
|
||||
# git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG}
|
||||
#BUILD_ALPINE_ARCH_AMD64=x86_64
|
||||
#BUILD_ALPINE_ARCH_AARCH64=aarch64
|
||||
#BUILD_S6_ARCH_amd64=x86_64
|
||||
#BUILD_S6_ARCH_aarch64=aarch64
|
||||
#BUILD_S6_OVERLAY_VERSION=3.2.0.2
|
||||
#BUILD_MAINTAINER=pi-farm
|
||||
#BUILD_APP_VERSION=v${BUILD_TAG}
|
||||
#BUILD_APP_NAME=basimage-alpine
|
||||
#BUILD_APP_USER=pi
|
||||
#BUILD_APP_GID=1000
|
||||
BUILD_TAG=0.6.2
|
||||
BUILD_TAG_LATEST=n
|
||||
BUILD_BASE_IMAGE=git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim
|
||||
BUILD_RUNTIME_IMAGE=git.pi-farm.de/pi-farm/docker-baseimage-debian:trixie-slim
|
||||
BUILD_MAINTAINER=pi-farm
|
||||
BUILD_APP_VERSION=${BUILD_TAG}
|
||||
BUILD_APP_GIT=https://github.com/oschonrock/hibp.git
|
||||
BUILD_APP_NAME=hibp
|
||||
BUILD_APP_USER=pi
|
||||
BUILD_APP_GID=1000
|
||||
|
||||
## ENV STAGE
|
||||
ENV_TZ=Europe/Berlin
|
||||
ENV_PUID=1000
|
||||
ENV_PGID=1000
|
||||
# VOL_CONFIG=./config:/config
|
||||
# VOL_DATA=./data:/data
|
||||
# PORT_WEB=8080:80
|
||||
#PUSH=gitea,dockerhub
|
||||
DESCRIPTION="Example example example"
|
||||
|
||||
VOL_DATA=/data
|
||||
PORT_WEB=8082:8082
|
||||
PUSH=gitea
|
||||
#,dockerhub
|
||||
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