diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5d96356..0b668f3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,10 +2,6 @@ name: Docker Build on: workflow_dispatch: - push: - branches: [ "main" ] - paths-ignore: - - '**/README.md' jobs: build: diff --git a/.gitea/workflows/docker-publish.yml b/.gitea/workflows/docker-publish.yml deleted file mode 100644 index a9563b7..0000000 --- a/.gitea/workflows/docker-publish.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Docker Build and Publish - -on: - workflow_dispatch: - -jobs: - docker-build-and-publish: - runs-on: ubuntu-amd64 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and push - uses: docker/build-push-action@v6 - with: - platforms: linux/amd64 - push: false - tags: ${{ vars.DOCKERHUB_REPO }}:2.10.0 , ${{ vars.DOCKERHUB_REPO }}:latest diff --git a/.gitea/workflows/merge.yaml b/.gitea/workflows/merge.yaml deleted file mode 100644 index f64a713..0000000 --- a/.gitea/workflows/merge.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Docker Merge - -on: - workflow_dispatch: - -jobs: - merge-docker-manifest: - runs-on: ubuntu-latest - steps: - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Create and push manifest images for pinned - uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab - with: - inputs: ${{ vars.DOCKERHUB_REPO }}:2.10.0-arm64,${{ vars.DOCKERHUB_REPO }}:2.10.0-amd64 - tags: ${{ vars.DOCKERHUB_REPO }}:2.10.0 - push: true - - - name: Create and push manifest images for latest - uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab - with: - inputs: ${{ vars.DOCKERHUB_REPO }}:latest-arm64,${{ vars.DOCKERHUB_REPO }}:latest-amd64 - tags: ${{ vars.DOCKERHUB_REPO }}:latest - push: true \ No newline at end of file diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 5357730..dbdb085 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -10,31 +10,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Add Docker Repo - run: apt-get update && - apt-get install -y ca-certificates curl && - install -m 0755 -d /etc/apt/keyrings && - curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && - chmod a+r /etc/apt/keyrings/docker.asc && - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && - apt-get update - - - name: Install Docker - run: apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ vars.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Setup Buildx Builder - run: docker buildx create --name mybuilder && - docker buildx use mybuilder - - - name: build the image - run: | - docker buildx build \ - --tag ${{ vars.DOCKERHUB_REPO }}:2.10.0 \ - --tag ${{ vars.DOCKERHUB_REPO }}:latest \ - --platform linux/arm64 . + - name: Parse Caddy version + id: version + run: echo "version=$(grep -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]+$' caddy-cloudflare/Dockerfile | cut -d ':' -f2)" | tee -a $GITHUB_OUTPUT + + - name: Print version + run: echo $GITHUB_OUTPUT