Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ppc64le): add an architecture #8

Closed
wants to merge 2 commits into from
Closed

feat(ppc64le): add an architecture #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
808a43c
chore(ci): simplify the branch protection rules
hutchic Dec 19, 2022
58781ac
feat(ppc64le): add an architecture
hutchic Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, Done]
enforce_admins:
required_linear_history: true
restrictions:
13 changes: 12 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ jobs:
name: Create Release Artifacts
strategy:
matrix:
architecture: [aarch64, x86_64]
architecture: [aarch64, x86_64, ppc64le]
ostype: [linux-gnu, linux-musl]
exclude:
- architecture: ppc64le
ostype: linux-musl
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -125,3 +128,11 @@ jobs:
ghcr.io/hutchic-org/kong-runtime:${{ needs.release.outputs.release-git-tag }}-aarch64-${{ matrix.ostype }} \
ghcr.io/hutchic-org/kong-runtime:${{ needs.release.outputs.release-git-tag }}-x86_64-${{ matrix.ostype }}
docker manifest push ghcr.io/hutchic-org/kong-runtime:${{ needs.release.outputs.release-git-tag }}-${{ matrix.ostype }}

done:
needs: [artifacts]
name: Done
if: needs.artifacts.result == 'success'
runs-on: ubuntu-latest
steps:
- run: echo 'done'
18 changes: 10 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ ARG DOCKER_IMAGE_NAME

# ATC-router image to copy in the installed atc-router
# List out all image permutations to trick dependabot
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-x86_64-unknown-linux-musl as atc-router-x86_64-linux-musl
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-x86_64-unknown-linux-gnu as atc-router-x86_64-linux-gnu
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-aarch64-unknown-linux-musl as atc-router-aarch64-linux-musl
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.1.3-aarch64-unknown-linux-gnu as atc-router-aarch64-linux-gnu
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-x86_64-unknown-linux-musl as atc-router-x86_64-linux-musl
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-x86_64-unknown-linux-gnu as atc-router-x86_64-linux-gnu
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-aarch64-unknown-linux-musl as atc-router-aarch64-linux-musl
FROM --platform=linux/arm64 ghcr.io/hutchic-org/atc-router-compiled:1.2.0-aarch64-unknown-linux-gnu as atc-router-aarch64-linux-gnu
FROM --platform=linux/ppc64le ghcr.io/hutchic-org/atc-router-compiled:1.2.0-powerpc64le-unknown-linux-gnu as atc-router-ppc64le-linux-gnu

# Kong openssl image as our base
# List out all image permutations to trick dependabot
FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.0.3-x86_64-linux-musl as x86_64-linux-musl
FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.0.3-x86_64-linux-gnu as x86_64-linux-gnu
FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.0.3-aarch64-linux-musl as aarch64-linux-musl
FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.0.3-aarch64-linux-gnu as aarch64-linux-gnu
FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.1.0-x86_64-linux-musl as x86_64-linux-musl
FROM --platform=linux/amd64 ghcr.io/hutchic-org/kong-openssl:1.1.0-x86_64-linux-gnu as x86_64-linux-gnu
FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.1.0-aarch64-linux-musl as aarch64-linux-musl
FROM --platform=linux/arm64 ghcr.io/hutchic-org/kong-openssl:1.1.0-aarch64-linux-gnu as aarch64-linux-gnu
FROM --platform=linux/ppc64le ghcr.io/hutchic-org/kong-openssl:1.1.0-ppc64le-linux-gnu as ppc64le-linux-gnu

FROM atc-router-$ARCHITECTURE-$OSTYPE as atc-router

Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function main() {
"--with-http_stub_status_module"
"--with-http_v2_module"
"--without-http_encrypted_session_module"
"--with-luajit-xcflags='-DLUAJIT_VERSION=\\\"${lj_version_tag}\\\"'"
"--with-luajit-xcflags='-std=gnu99 -DLUAJIT_VERSION=\\\"${lj_version_tag}\\\"'"
"-j2"
)

Expand Down