This is an automated email from the ASF dual-hosted git repository.
shreemaanabhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 2993386 ci: include libyaml in image and use docker compose (#562)
2993386 is described below
commit 29933866930ab01e3b0b2a2c484b7bca22a0b225
Author: Shubhendra Kushwaha <[email protected]>
AuthorDate: Wed Aug 14 10:05:59 2024 +0530
ci: include libyaml in image and use docker compose (#562)
---
.github/workflows/apisix-docker-example-test-standalone.yaml | 2 +-
.github/workflows/apisix-docker-example-test.yaml | 2 +-
.github/workflows/apisix_dev_docker_local_test.yaml | 4 ++--
.github/workflows/apisix_dev_push_docker_hub.yaml | 2 +-
.github/workflows/apisix_push_docker_hub.yaml | 2 +-
.github/workflows/dashboard_push_docker_hub.yaml | 2 +-
all-in-one/apisix-dashboard/Dockerfile | 12 +++++++++++-
apisix | 1 +
debian-dev/Dockerfile.local | 2 ++
9 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/apisix-docker-example-test-standalone.yaml
b/.github/workflows/apisix-docker-example-test-standalone.yaml
index 140c102..fdaae3f 100644
--- a/.github/workflows/apisix-docker-example-test-standalone.yaml
+++ b/.github/workflows/apisix-docker-example-test-standalone.yaml
@@ -55,7 +55,7 @@ jobs:
env:
APISIX_IMAGE_TAG: ${{ format('{0}-{1}', env.APISIX_VERSION,
matrix.platform) }}
APISIX_STAND_ALONE: true
- run: docker-compose -p docker-apisix -f
example/docker-compose-standalone.yml up -d
+ run: docker compose -p docker-apisix -f
example/docker-compose-standalone.yml up -d
- name: Test APISIX
run: |
diff --git a/.github/workflows/apisix-docker-example-test.yaml
b/.github/workflows/apisix-docker-example-test.yaml
index 3f11473..10b77d9 100644
--- a/.github/workflows/apisix-docker-example-test.yaml
+++ b/.github/workflows/apisix-docker-example-test.yaml
@@ -54,7 +54,7 @@ jobs:
- name: use docker-compose
env:
APISIX_IMAGE_TAG: ${{ format('{0}-{1}', env.APISIX_VERSION,
matrix.platform) }}
- run: docker-compose -p docker-apisix -f example/docker-compose.yml up
-d
+ run: docker compose -p docker-apisix -f example/docker-compose.yml up
-d
- name: Test APISIX
run: |
diff --git a/.github/workflows/apisix_dev_docker_local_test.yaml
b/.github/workflows/apisix_dev_docker_local_test.yaml
index ca8f58d..1af6818 100644
--- a/.github/workflows/apisix_dev_docker_local_test.yaml
+++ b/.github/workflows/apisix_dev_docker_local_test.yaml
@@ -42,12 +42,12 @@ jobs:
make build-on-debian-local-dev
- name: use docker-compose
- run: docker-compose -p docker-apisix -f example/docker-compose.yml up
-d
+ run: docker compose -p docker-apisix -f example/docker-compose.yml up
-d
- name: Test APISIX
run: |
sleep 2
- docker logs docker-apisix_apisix_1
+ docker logs docker-apisix-apisix-1
sleep 30
diff --git a/.github/workflows/apisix_dev_push_docker_hub.yaml
b/.github/workflows/apisix_dev_push_docker_hub.yaml
index 82fe243..ca1b777 100644
--- a/.github/workflows/apisix_dev_push_docker_hub.yaml
+++ b/.github/workflows/apisix_dev_push_docker_hub.yaml
@@ -26,7 +26,7 @@ jobs:
- name: Build and run
run: |
make build-on-debian-dev
- docker-compose -f ./compose/docker-compose-master.yaml up -d
+ docker compose -f ./compose/docker-compose-master.yaml up -d
sleep 30
docker logs compose_apisix_1
diff --git a/.github/workflows/apisix_push_docker_hub.yaml
b/.github/workflows/apisix_push_docker_hub.yaml
index f0f05a3..cc67383 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -22,7 +22,7 @@ jobs:
- name: Build and run
run: |
make build-on-${{ matrix.platform }}
- docker-compose -f ./compose/docker-compose-release.yaml up -d
+ docker compose -f ./compose/docker-compose-release.yaml up -d
sleep 30
docker logs compose_apisix_1
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml
b/.github/workflows/dashboard_push_docker_hub.yaml
index e1b9296..db680ca 100644
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ b/.github/workflows/dashboard_push_docker_hub.yaml
@@ -23,7 +23,7 @@ jobs:
- name: Build and run
run: |
make build-dashboard-${{ matrix.os }}
- docker-compose -f ./compose/dashboard-compose.yaml up -d
+ docker compose -f ./compose/dashboard-compose.yaml up -d
sleep 30
docker logs compose_dashboard_1
diff --git a/all-in-one/apisix-dashboard/Dockerfile
b/all-in-one/apisix-dashboard/Dockerfile
index bf906d0..0699ee9 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -35,9 +35,18 @@ RUN set -x \
libtool \
pkgconfig \
cmake \
+ make \
+ clang \
+ wget \
git \
openldap-dev \
sudo \
+ && wget
https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz \
+ && tar -zxvf yaml-0.2.5.tar.gz \
+ && cd yaml-0.2.5 \
+ && ./configure \
+ && make \
+ && make install \
&& mkdir ~/.luarocks \
&& luarocks config variables.OPENSSL_LIBDIR
/usr/local/openresty/openssl/lib \
&& luarocks config variables.OPENSSL_INCDIR
/usr/local/openresty/openssl/include \
@@ -46,7 +55,7 @@ RUN set -x \
&& cp -v
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix
/usr/bin/ \
&& (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ];
then echo 'use shell ';else bin='#!
/usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@"
/usr/bin/apisix ; fi;) \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
- && apk del .builddeps build-base make unzip
+ && apk del .builddeps build-base make unzip clang wget
# Build etcd
FROM alpine:3.13 AS etcd-stage
@@ -116,6 +125,7 @@ WORKDIR /usr/local/apisix
COPY --from=production-stage /usr/local/openresty/ /usr/local/openresty/
COPY --from=production-stage /usr/local/apisix/ /usr/local/apisix/
COPY --from=production-stage /usr/bin/apisix /usr/bin/apisix
+COPY --from=production-stage /usr/local/lib/libyaml* /usr/local/lib/
COPY --from=etcd-stage /tmp/etcd/etcd /usr/bin/etcd
COPY --from=etcd-stage /tmp/etcd/etcdctl /usr/bin/etcdctl
diff --git a/apisix b/apisix
new file mode 160000
index 0000000..e746746
--- /dev/null
+++ b/apisix
@@ -0,0 +1 @@
+Subproject commit e74674649fde29cc59ae70be1f8a6f2266b3ba40
diff --git a/debian-dev/Dockerfile.local b/debian-dev/Dockerfile.local
index f3ba829..c920946 100644
--- a/debian-dev/Dockerfile.local
+++ b/debian-dev/Dockerfile.local
@@ -35,6 +35,7 @@ RUN set -x \
make \
git \
sudo \
+ libyaml-dev \
&& ls -al \
&& make deps \
&& mkdir -p ${ENV_INST_LUADIR} \
@@ -49,6 +50,7 @@ ARG INSTALL_BROTLI=./install-brotli.sh
COPY --from=build /usr/local/apisix /usr/local/apisix
COPY --from=build /usr/local/openresty /usr/local/openresty
COPY --from=build /usr/bin/apisix /usr/bin/apisix
+COPY --from=build /usr/lib/x86_64-linux-gnu/libyaml* /usr/local/lib/
COPY ${INSTALL_BROTLI} /install-brotli.sh
RUN chmod +x /install-brotli.sh \
