Skip to content

feat: packaging apisix based on apisix-runtime #353

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

Merged
merged 3 commits into from
Nov 21, 2023
Merged

feat: packaging apisix based on apisix-runtime #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b8ef47
feat: packaging apisix based on apisix-runtime
AlinsRan Nov 21, 2023
1a8aa10
update apisix deb ci
AlinsRan Nov 21, 2023
49bcd88
update ci
AlinsRan Nov 21, 2023
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
15 changes: 10 additions & 5 deletions .github/workflows/publish-deb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,20 @@ jobs:
echo "##[error]Tag type is not correct, please check it."
exit 1

- name: Build apisix or apisix-base deb Package
if: ${{ env.TAG_TYPE == 'apisix' || env.TAG_TYPE == 'apisix-base' }}
- name: Build apisix-base deb Package
if: ${{ env.TAG_TYPE == 'apisix-base' }}
run: |
echo build ${TAG_TYPE} deb package
echo version ${TAG_VERSION}

make package type=deb app=${TAG_TYPE} checkout=${TAG_VERSION} version=${TAG_VERSION} image_base=${VAR_OS} image_tag=${VAR_OS_RELEASE} openresty=apisix-base
mv ./output/${TAG_TYPE}_${TAG_VERSION}-0~${VAR_OS}${VAR_OS_RELEASE}_amd64.deb ${VAR_DEB_WORKBENCH_DIR}

- name: Build apisix deb Package
if: ${{ env.TAG_TYPE == 'apisix' }}
run: |
wget https://raw.githubusercontent.com/apache/apisix/${TAG_VERSION}/.requirements && source .requirements

make package type=deb app=${TAG_TYPE} checkout=${TAG_VERSION} version=${TAG_VERSION} image_base=${VAR_OS} image_tag=${VAR_OS_RELEASE} openresty=apisix-runtime runtime_version=${APISIX_RUNTIME}
mv ./output/${TAG_TYPE}_${TAG_VERSION}-0~${VAR_OS}${VAR_OS_RELEASE}_amd64.deb ${VAR_DEB_WORKBENCH_DIR}

- name: Upload apisix/apisix-base Artifact
uses: actions/upload-artifact@v2.2.3
with:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,13 @@ jobs:
env:
APISIX_TAG_VERSION: ${{ steps.tag_env.outputs.version}}
run: |
wget https://raw.githubusercontent.com/apache/apisix/${APISIX_TAG_VERSION}/.requirements
source .requirements
# build apisix
make package type=rpm app=apisix openresty=apisix-base checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=centos image_tag=7
make package type=rpm app=apisix openresty=apisix-base checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=centos image_tag=8
make package type=rpm app=apisix openresty=apisix-base checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=centos image_tag=7
make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=centos image_tag=8
make package type=rpm app=apisix openresty=apisix-runtime runtime_version=${APISIX_RUNTIME} checkout=${APISIX_TAG_VERSION} version=${APISIX_TAG_VERSION} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6
mv ./output/apisix-${APISIX_TAG_VERSION}-0.{el7,el8,ubi8.6}.x86_64.rpm ${VAR_RPM_WORKBENCH_DIR}
echo "TARGET_APP=apisix" >> "$GITHUB_ENV"
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ iteration=0
local_code_path=0
openresty="openresty"
artifact="0"
runtime_version="0"
apisix_repo="https://github.com/apache/apisix"
dashboard_repo="https://github.com/apache/apisix-dashboard"

Expand Down Expand Up @@ -103,6 +104,7 @@ define package
--build-arg VERSION=$(version) \
--build-arg ITERATION=$(iteration) \
--build-arg PACKAGE_VERSION=$(version) \
--build-arg RUNTIME_VERSION=$(runtime_version) \
--build-arg PACKAGE_TYPE=$(2) \
--build-arg OPENRESTY=$(openresty) \
--build-arg ARTIFACT=$(artifact) \
Expand Down
2 changes: 2 additions & 0 deletions dockerfiles/Dockerfile.package.apisix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ ARG PACKAGE_VERSION
ARG PACKAGE_TYPE
ARG OPENRESTY
ARG ARTIFACT
ARG RUNTIME_VERSION

ENV ITERATION=${ITERATION}
ENV PACKAGE_VERSION=${PACKAGE_VERSION}
ENV PACKAGE_TYPE=${PACKAGE_TYPE}
ENV OPENRESTY=${OPENRESTY}
ENV RUNTIME_VERSION=${RUNTIME_VERSION}
ENV ARTIFACT=${ARTIFACT}

COPY --from=APISIX /tmp/build/output /tmp/build/output
Expand Down
2 changes: 1 addition & 1 deletion package-apisix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ then
-a "$(uname -i)" \
-v "$PACKAGE_VERSION" \
--iteration "$ITERATION" \
-d "$OPENRESTY == $VERSION" \
-d "$OPENRESTY = $RUNTIME_VERSION" \
-d "$dep_ldap" \
-d "$dep_pcre" \
-d "$dep_which" \
Expand Down