Compare commits
16 Commits
af22084961
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
642d1cc033 | ||
| 80853ea6f2 | |||
|
|
1ee80ecd63 | ||
| 40beeedfa8 | |||
| 035f66ddb1 | |||
| b910307ae0 | |||
| 6cfb526f8b | |||
|
|
ec6c889611 | ||
| 2525fd16b1 | |||
| 4b7d09001a | |||
|
|
1de39774ac | ||
| 77d89f187e | |||
|
|
ba48437ccd | ||
|
|
8660cadce7 | ||
| 507f107299 | |||
| 330ab02b39 |
@@ -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')
|
||||
|
||||
@@ -76,8 +76,8 @@ RUN echo "**** create user and folders ****" && \
|
||||
mkdir -p /app /config /defaults /lsiopy
|
||||
|
||||
# 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren
|
||||
ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp
|
||||
RUN tar -C / -zxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz
|
||||
ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/new-stable.tar.gz /tmp
|
||||
RUN tar -C /etc/ -zxpf /tmp/new-stable.tar.gz && rm -rf /tmp/new-stable.tar.gz
|
||||
RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} +
|
||||
|
||||
ENTRYPOINT ["/init"]
|
||||
@@ -74,8 +74,8 @@ RUN echo "**** create user and folders ****" && \
|
||||
mkdir -p /app /config /defaults /lsiopy
|
||||
|
||||
# 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren
|
||||
ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp
|
||||
RUN tar -C / -zxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz
|
||||
ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/new-stable.tar.gz /tmp
|
||||
RUN tar -C /etc/ -zxpf /tmp/new-stable.tar.gz && rm -rf /tmp/new-stable.tar.gz
|
||||
RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} +
|
||||
|
||||
ENTRYPOINT ["/init"]
|
||||
@@ -12,8 +12,8 @@ This repository is built and pushed automatically.
|
||||
### 🏗️ Platform Support
|
||||
| Architecture | Status | Base Image | Build Date |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| x86_64 (amd64) | ✅ Active | registry.access.redhat.com/ubi9/ubi-minimal:latest | 18.03.2026 01:48 |
|
||||
| aarch64 (arm64) | ✅ Active | registry.access.redhat.com/ubi9/ubi-minimal:latest | 18.03.2026 01:48 |
|
||||
| x86_64 (amd64) | ✅ Active | registry.access.redhat.com/ubi9/ubi-minimal:9.3 | 23.03.2026 21:23 |
|
||||
| aarch64 (arm64) | ✅ Active | registry.access.redhat.com/ubi9/ubi-minimal:9.3 | 23.03.2026 21:23 |
|
||||
|
||||
### 🚀 Docker Pull
|
||||
```bash
|
||||
@@ -44,9 +44,10 @@ docker run -d \
|
||||
git.pi-farm.de/pi-farm/docker-baseimage-rhel:latest
|
||||
```
|
||||
|
||||
*Last updated on: 18.03.2026 01:48*
|
||||
*Last updated on: 23.03.2026 21:23*
|
||||
|
||||
### 📜 Version History
|
||||
| Version | Date | Status |
|
||||
| :--- | :--- | :--- |
|
||||
| **latest** | 18.03.2026 01:48 | Merge pull request dev (#1) from dev into main Reviewed-on: https://git.pi-farm.de/pi-farm/docker-baseimage-rhel/pulls/1 ✅ |
|
||||
| **latest** | 23.03.2026 21:23 | 9.3 ✅ |
|
||||
| **latest** | 23.03.2026 21:13 | 9.3 ✅ |
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
| **latest** | 18.03.2026 01:48 | Merge pull request dev (#1) from dev into main Reviewed-on: https://git.pi-farm.de/pi-farm/docker-baseimage-rhel/pulls/1 ✅ |
|
||||
| **latest** | 23.03.2026 21:23 | 9.3 ✅ |
|
||||
| **latest** | 23.03.2026 21:13 | 9.3 ✅ |
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
## BUILD STAGE
|
||||
BUILD_BASE_TAG=9.3
|
||||
BUILD_TAG_LATEST=y
|
||||
BUILD_TAG_LATEST=n
|
||||
# Wir nutzen UBI Minimal für ein kleines Image
|
||||
BUILD_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
|
||||
BUILD_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:${BUILD_BASE_TAG}
|
||||
|
||||
BUILD_RHEL_ARCH=x86_64
|
||||
BUILD_RHEL_ARCH_AARCH64=aarch64
|
||||
|
||||
Reference in New Issue
Block a user