diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 4a48bb2..3da225b 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -59,7 +59,6 @@ jobs: ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-x86_64 - name: Build Alpine OpenVox Server ${{ matrix.release }} container - if: ${{ matrix.release == '8' }} uses: voxpupuli/gha-build-and-publish-a-container@v2 with: registry_password: ${{ secrets.GITHUB_TOKEN }} @@ -106,7 +105,6 @@ jobs: ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64 - name: Build Alpine OpenVox Server ${{ matrix.release }} container - if: ${{ matrix.release == '8' }} uses: voxpupuli/gha-build-and-publish-a-container@v2 with: registry_password: ${{ secrets.GITHUB_TOKEN }} @@ -182,7 +180,6 @@ jobs: ghcr.io/openvoxproject/openvoxserver:8-${{ github.sha }}-x86_64 - name: Create Alpine multi arch manifests - if: ${{ matrix.release == '8' }} run: | docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxserver:${{ steps.server_version.outputs.server_version }}-${{ github.ref_name }}-alpine-beta \ ghcr.io/openvoxproject/openvoxserver:${{ matrix.release }}-${{ github.sha }}-arm64-alpine \ diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 80b8040..391aef5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -80,7 +80,6 @@ jobs: RUGGED_VERSION=${{ matrix.rugged_version }} - name: Build Alpine image - if: ${{ matrix.release == '8' }} uses: docker/build-push-action@v6 with: tags: 'ci/openvoxserver:${{ steps.extract_server_version.outputs.server_version }}-alpine' diff --git a/README.md b/README.md index f237c75..20be33e 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ podman run --name openvox --hostname openvox -v ./code:/etc/puppetlabs/code/ ghc | Name | Description | | --- | --- | -| openvox.major | Describes the contained major OpenVox version (7 or 8) | +| openvox.major | Describes the contained major OpenVox version | | openvox.minor | Describes the contained minor OpenVox version | | openvox.patch | Describes the contained patchlevel OpenVox version | | container.major | Describes the major version of the base container (Ubunutu 24.04) or incompatible changes | diff --git a/build_versions.yaml b/build_versions.yaml index 0638fea..e4fdb65 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -1,13 +1,5 @@ --- include: - - release: 7 - # renovate: depName=openvox-server openVoxRelease=7 - server_version: "7.18.2-1+ubuntu24.04" - # renovate: depName=openvoxdb openVoxRelease=7 - db_version: "7.21.2-1+ubuntu24.04" - r10k_version: "5.0.0" - rugged_version: "1.9.0" - - release: 8 # renovate: depName=openvox-server openVoxRelease=8 server_version: "8.8.1-1+ubuntu24.04"