diff --git a/.dockerignore b/.dockerignore index 69a1a68..bedd03b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,6 @@ .gitignore .github .gitattributes -.github-lsio +.gitea READMETEMPLATE.md README.md diff --git a/.gitea/workflows/docker-builder.yml b/.gitea/workflows/docker-builder.yml new file mode 100644 index 0000000..c8a769e --- /dev/null +++ b/.gitea/workflows/docker-builder.yml @@ -0,0 +1,41 @@ +name: Docker Build + +on: + push: + branches: + - 3.23 + workflow_dispatch: + +jobs: + build: + runs-on: self-hosted + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set build metadata + run: | + echo "BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITEA_ENV + echo "VERSION=${GITEA_REF_NAME}" >> $GITEA_ENV + +# - name: Build Docker image +# run: | +# docker build \ +# --build-arg BUILD_DATE=${BUILD_DATE} \ +# --build-arg VERSION=${VERSION} \ +# -t docker-baseimage-alpine:${VERSION} . + - name: Login to registry + run: | + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login \ + git.pi-farm.de \ + -u ${{ secrets.REGISTRY_USER }} \ + --password-stdin + + - name: Build & push + run: | + docker build \ + --build-arg BUILD_DATE=${BUILD_DATE} \ + --build-arg VERSION=${VERSION} \ + -t git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION} . + docker push git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION} \ No newline at end of file diff --git a/.gitignore b/.gitignore index df7b6af..6e8ad97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -.github-lsio - # Windows image file caches Thumbs.db ehthumbs.db diff --git a/config/config-test b/config/config-test deleted file mode 100644 index e69de29..0000000 diff --git a/docker-compose.yml b/docker-compose.yml index f3fbbde..db0be96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,20 @@ services: alpine: - build: - context: . - dockerfile: Dockerfile - args: - BUILD_DATE: 2026-02-03 - VERSION: 0.1 - image: baseimage-alpine:0.1 +# build: +# context: . +# dockerfile: Dockerfile #for x86_64 +# dockerfile: Dockerfile.aarch64 #for arm64 +# args: +# BUILD_DATE: 2026-02-03 +# VERSION: 3.23 + image: git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23 container_name: alpine environment: - PUID=1000 - PGID=1000 - TZ=Europe/Berlin - volumes: - - ./config:/config +# volumes: +# - ./config:/config # ports: # -80:80 restart: unless-stopped \ No newline at end of file