diff --git a/.github/settings.yml b/.github/settings.yml index 4c09f80..28ea6e3 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -64,8 +64,7 @@ branches: required_pull_request_reviews: required_status_checks: strict: true - contexts: [pre-commit, Create Release, 'Create Release Artifacts (aarch64, linux-gnu)', 'Create Release Artifacts (aarch64, linux-musl)', 'Create - Release Artifacts (x86_64, linux-gnu)', 'Create Release Artifacts (x86_64, linux-musl)'] + contexts: [pre-commit, Create Release, 'Create Release Artifacts (aarch64, linux-gnu)', 'Create Release Artifacts (x86_64, linux-gnu)'] enforce_admins: required_linear_history: true restrictions: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 072a14c..350fd15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: strategy: matrix: architecture: [aarch64, x86_64] - ostype: [linux-gnu, linux-musl] + ostype: [linux-gnu] runs-on: ubuntu-latest steps: - name: Checkout @@ -107,7 +107,7 @@ jobs: if: ${{ needs.release.outputs.published == 'true' }} strategy: matrix: - ostype: [linux-gnu, linux-musl] + ostype: [linux-gnu] runs-on: ubuntu-latest steps: - name: Log in to the Container registry diff --git a/Dockerfile b/Dockerfile index 5632bd5..074c6c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,7 @@ ARG DOCKER_REGISTRY=ghcr.io ARG DOCKER_IMAGE_NAME # List out all image permutations to trick dependabot -FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.2.78-x86_64-linux-musl as x86_64-linux-musl FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.2.78-x86_64-linux-gnu as x86_64-linux-gnu -FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.2.78-aarch64-linux-musl as aarch64-linux-musl FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.2.78-aarch64-linux-gnu as aarch64-linux-gnu # Run the build script diff --git a/kong b/kong index 1ccd94f..85638b5 160000 --- a/kong +++ b/kong @@ -1 +1 @@ -Subproject commit 1ccd94fb84a9975587c387129f41b6567b614f80 +Subproject commit 85638b5788538a59596c7a90aeb8867a92309dca