Skip to content

Commit cba92da

Browse files
authored
feat: package etcdctl (#264)
1 parent 072e9d1 commit cba92da

5 files changed

+18
-39
lines changed

.github/workflows/package-apisix-base-apk.yml

-39
This file was deleted.

.github/workflows/package-apisix-base-deb-ubuntu20.04.yml

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
5252
- name: check and ensure apisix-base is installed
5353
run: |
54+
docker exec ubuntu20.04Instance bash -c "/usr/local/openresty/bin/etcdctl -h" || exit 1
5455
export APISIX_BASE_VER=$(docker exec ubuntu20.04Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_BASE_VER=/{print $5}' | awk -v FS="=" '{print $2}')
5556
if [ "$APISIX_BASE_VER" != "${BUILD_APISIX_BASE_VERSION}" ]; then exit 1; fi
5657

.github/workflows/package-apisix-base-rpm-el7.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
4747
- name: check and ensure apisix-base is installed
4848
run: |
49+
docker exec centos7Instance bash -c "/usr/local/openresty/bin/etcdctl -h" || exit 1
4950
export APISIX_BASE_VER=$(docker exec centos7Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_BASE_VER=/{print $5}' | awk -v FS="=" '{print $2}')
5051
if [ "$APISIX_BASE_VER" != "${BUILD_APISIX_BASE_VERSION}" ]; then exit 1; fi
5152

.github/workflows/package-apisix-base-rpm-el8.yml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
5454
- name: check and ensure apisix-base is installed
5555
run: |
56+
docker exec centos8Instance bash -c "/usr/local/openresty/bin/etcdctl -h" || exit 1
5657
export APISIX_BASE_VER=$(docker exec centos8Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_BASE_VER=/{print $5}' | awk -v FS="=" '{print $2}')
5758
if [ "$APISIX_BASE_VER" != "${BUILD_APISIX_BASE_VERSION}" ]; then exit 1; fi
5859

build-apisix-base.sh

+15
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,18 @@ cd ..
173173
cd amesh-${amesh_ver} || exit 1
174174
sudo OPENRESTY_PREFIX="$OR_PREFIX" sh -c 'PATH="${PATH}:/usr/local/go/bin" make install'
175175
cd ..
176+
177+
# package etcdctl
178+
ETCD_ARCH="amd64"
179+
ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}
180+
ARCH=${ARCH:-$(uname -m | tr '[:upper:]' '[:lower:]')}
181+
182+
if [[ $ARCH == "arm64" ]] || [[ $ARCH == "aarch64" ]]; then
183+
ETCD_ARCH="arm64"
184+
fi
185+
186+
wget -q https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}.tar.gz
187+
tar xf etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}.tar.gz
188+
# ship etcdctl under the same bin dir of openresty so we can package it easily
189+
sudo cp etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}/etcdctl "$OR_PREFIX"/bin/
190+
rm -rf etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}

0 commit comments

Comments
 (0)