diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml index 2653d80..63622eb 100644 --- a/.gitea/workflows/build_docker.yaml +++ b/.gitea/workflows/build_docker.yaml @@ -6,64 +6,65 @@ env: DOCKER_HOST: tcp://127.0.0.1:2375 jobs: - build: - name: Build Docker Image - runs-on: docker-x86 - container: - image: docker:dind - privileged: true - env: - ARCH: x86_64 - VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }} - - steps: - - name: Environment Setup - run: | - # If we have a proxy use it - if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi - # Some pre-reqs - apk add git curl nodejs - # Start docker - ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3 - ## Some debugging info - # docker info && docker version - # env|sort - - - name: Registry FQDN Setup - id: registry - run: | - registry=${{ github.server_url }} - echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT" - - - name: Container Registry Login - uses: docker/login-action@v2 - with: - registry: ${{ steps.registry.outputs.registry }} - username: ${{ gitea.actor }} - password: ${{ secrets.PKG_WRITE_TOKEN }} - - - name: Code Checkout - uses: actions/checkout@v4 - - - name: Build and Push Docker Image - uses: docker/build-push-action@v5 - with: - context: . - file: ./Dockerfile - push: true - tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}" +# build: +# name: Build Docker Image +# runs-on: docker-x86 +# container: +# image: docker:dind +# privileged: true +# env: +# ARCH: x86_64 +# VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }} +# +# steps: +# - name: Environment Setup +# run: | +# # If we have a proxy use it +# if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi +# # Some pre-reqs +# apk add git curl nodejs +# # Start docker +# ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3 +# ## Some debugging info +# # docker info && docker version +# # env|sort +# +# - name: Registry FQDN Setup +# id: registry +# run: | +# registry=${{ github.server_url }} +# echo "registry=${registry##http*://}" >> "$GITHUB_OUTPUT" +# +# - name: Container Registry Login +# uses: docker/login-action@v2 +# with: +# registry: ${{ steps.registry.outputs.registry }} +# username: ${{ gitea.actor }} +# password: ${{ secrets.PKG_WRITE_TOKEN }} +# +# - name: Code Checkout +# uses: actions/checkout@v4 +# +# - name: Build and Push Docker Image +# uses: docker/build-push-action@v5 +# with: +# context: . +# file: ./Dockerfile +# push: true +# tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}" manifest: name: Final Docker Image Manifest runs-on: docker-x86 - container: + container: image: docker:dind privileged: true - needs: build +# needs: build steps: - name: Build Docker Manifest run: | - docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \ + docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} \ + ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 # ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-armv7l docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}