You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by so...@apache.org on 2022/09/16 01:13:31 UTC
[apisix-docker] branch test-release created (now 43c78d2)
This is an automated email from the ASF dual-hosted git repository.
soulbird pushed a change to branch test-release
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
at 43c78d2 re-push apisix:2.15.0-centos
This branch includes the following new commits:
new 43c78d2 re-push apisix:2.15.0-centos
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[apisix-docker] 01/01: re-push apisix:2.15.0-centos
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
soulbird pushed a commit to branch test-release
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
commit 43c78d2e927666d5ac38fd580aa8f769d07465d3
Author: soulbird <zh...@gmail.com>
AuthorDate: Fri Sep 16 09:13:18 2022 +0800
re-push apisix:2.15.0-centos
---
.github/workflows/apisix-docker-dev-test.yaml | 65 -----------------------
.github/workflows/apisix-docker-test.yaml | 65 -----------------------
.github/workflows/apisix_all_in_one_ci.yaml | 22 --------
.github/workflows/apisix_dev_push_docker_hub.yaml | 36 -------------
.github/workflows/apisix_push_docker_hub.yaml | 5 +-
.github/workflows/dashboard-docker-test.yaml | 47 ----------------
.github/workflows/dashboard_all_in_one_ci.yaml | 23 --------
.github/workflows/dashboard_push_docker_hub.yaml | 27 ----------
.github/workflows/lint.yml | 16 ------
.github/workflows/linux_alpine_ci.yaml | 15 ------
.github/workflows/linux_ci.yml | 15 ------
.github/workflows/stale.yml | 46 ----------------
12 files changed, 1 insertion(+), 381 deletions(-)
diff --git a/.github/workflows/apisix-docker-dev-test.yaml b/.github/workflows/apisix-docker-dev-test.yaml
deleted file mode 100644
index 0358382..0000000
--- a/.github/workflows/apisix-docker-dev-test.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: APISIX Docker dev Test
-
-on:
- schedule:
- - cron: "0 1 * * *"
- push:
- branches: [master]
- paths-ignore:
- - 'docs/**'
- - '**/*.md'
-
-jobs:
- build:
- strategy:
- fail-fast: false
- matrix:
- platform:
- - debian-dev
-
- runs-on: ubuntu-latest
- env:
- APISIX_VERSION: master
- APISIX_DOCKER_TAG: master-${{ matrix.platform }}
- steps:
- - uses: actions/checkout@v2
-
- - name: Build and run
- run: |
- make build-on-${{ matrix.platform }}
- docker-compose -f ./compose/docker-compose.yaml up -d
- sleep 30
- docker logs compose_apisix_1
-
- - name: Test
- run: |
- grep -C 3 '\[error\]' example/apisix_log/error.log && exit 1
-
- curl http://127.0.0.1:9180/apisix/admin/routes/1 \
- -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
- {
- "uri": "/get",
- "upstream": {
- "type": "roundrobin",
- "nodes": {
- "httpbin.org:80": 1
- }
- }
- }'
-
- result_code=`curl -I -m 10 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/get`
- if [[ $result_code -ne 200 ]];then
- printf "result_code: %s\n" "$result_code"
- exit 125
- fi
-
- - name: Tar Image
- if: ${{ !endsWith(matrix.platform, '-local') && !endsWith(matrix.platform, '-dev') }}
- run: |
- make save-${{ matrix.platform }}-tar
-
- - name: Upload Image
- if: ${{ !endsWith(matrix.platform, '-local') && !endsWith(matrix.platform, '-dev') }}
- uses: actions/upload-artifact@v2
- with:
- path: ./package
diff --git a/.github/workflows/apisix-docker-test.yaml b/.github/workflows/apisix-docker-test.yaml
deleted file mode 100644
index 7ed687a..0000000
--- a/.github/workflows/apisix-docker-test.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: APISIX Docker Test
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- strategy:
- fail-fast: false
- matrix:
- platform:
- - alpine
- - centos
- - debian
-
- runs-on: ubuntu-latest
- env:
- APISIX_DOCKER_TAG: 2.15.0-${{ matrix.platform }}
- steps:
- - uses: actions/checkout@v2
-
- - name: Build and run
- run: |
- make build-on-${{ matrix.platform }}
- docker-compose -f ./compose/docker-compose.yaml up -d
- sleep 30
- docker logs compose_apisix_1
-
- - name: Test
- run: |
- grep -C 3 '\[error\]' example/apisix_log/error.log && exit 1
-
- curl http://127.0.0.1:9080/apisix/admin/routes/1 \
- -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
- {
- "uri": "/get",
- "upstream": {
- "type": "roundrobin",
- "nodes": {
- "httpbin.org:80": 1
- }
- }
- }'
-
- result_code=`curl -I -m 10 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/get`
- if [[ $result_code -ne 200 ]];then
- printf "result_code: %s\n" "$result_code"
- exit 125
- fi
-
- - name: Tar Image
- if: ${{ !endsWith(matrix.platform, '-local') && !endsWith(matrix.platform, '-dev') }}
- run: |
- make save-${{ matrix.platform }}-tar
-
- - name: Upload Image
- if: ${{ !endsWith(matrix.platform, '-local') && !endsWith(matrix.platform, '-dev') }}
- uses: actions/upload-artifact@v2
- with:
- path: ./package
diff --git a/.github/workflows/apisix_all_in_one_ci.yaml b/.github/workflows/apisix_all_in_one_ci.yaml
deleted file mode 100644
index 5d24c6d..0000000
--- a/.github/workflows/apisix_all_in_one_ci.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: apisix all in one docker
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Build and Test
- run: |
- docker build -t apache/apisix:whole -f ./all-in-one/apisix/Dockerfile .
- docker run -v `pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -p 9080:9080 -p 2379:2379 --name apisix -d apache/apisix:whole
- sleep 30
- curl http://127.0.0.1:9080/apisix/admin/schema/service -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1'
diff --git a/.github/workflows/apisix_dev_push_docker_hub.yaml b/.github/workflows/apisix_dev_push_docker_hub.yaml
deleted file mode 100644
index 412206b..0000000
--- a/.github/workflows/apisix_dev_push_docker_hub.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build and Push apisix-dev to Docker DockerHub
-
-
-on:
- schedule:
- # UTC 0:00 AM (See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
- - cron: "0 1 * * *"
- push:
- branches: [master]
- paths-ignore:
- - 'docs/**'
- - '**/*.md'
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Check out the repo
- uses: actions/checkout@v2
-
- - name: Login to Docker Hub
- uses: docker/login-action@v1
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
-
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
-
- - name: Push apisix image to Docker Hub
- run: |
- make push-multiarch-dev-on-debian
diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml
index e9e5f84..0aedd6b 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -1,7 +1,7 @@
name: Push apisix to Docker image
on:
push:
- branches: ['release/apisix-**']
+ branches: ['test-release']
jobs:
build:
runs-on: ubuntu-latest
@@ -24,7 +24,4 @@ jobs:
- name: Push apisix image to Docker Hub
run: |
- make push-multiarch-on-debian
- make push-multiarch-on-alpine
make push-multiarch-on-centos
- make push-multiarch-on-latest
diff --git a/.github/workflows/dashboard-docker-test.yaml b/.github/workflows/dashboard-docker-test.yaml
deleted file mode 100644
index b3e82bc..0000000
--- a/.github/workflows/dashboard-docker-test.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: dashboard docker test
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- dashboard-docker-test:
- strategy:
- fail-fast: false
- matrix:
- os:
- - centos
- - alpine
- name: build dashboard & test on ${{ matrix.os }}
- runs-on: ubuntu-latest
- env:
- APISIX_DASHBOARD_TAG: "2.13"
- steps:
- - name: Checkout
- uses: actions/checkout@v2
-
- - name: Build and run
- run: |
- make build-dashboard-${{ matrix.os }}
- docker-compose -f ./compose/dashboard-compose.yaml up -d
- sleep 30
- docker logs compose_dashboard_1
-
- - name: check
- run: |
- wget https://raw.githubusercontent.com/apache/apisix-dashboard/master/api/test/shell/manager_smoking.sh
- chmod +x ./manager_smoking.sh
- sh manager_smoking.sh -s true
-
- - name: Tar Image
- run: |
- make save-dashboard-${{ matrix.os }}-tar
-
- - name: Upload Image
- uses: actions/upload-artifact@v2
- with:
- path: ./package
diff --git a/.github/workflows/dashboard_all_in_one_ci.yaml b/.github/workflows/dashboard_all_in_one_ci.yaml
deleted file mode 100644
index 4bfb7af..0000000
--- a/.github/workflows/dashboard_all_in_one_ci.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: apisix dashboard all in one docker
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Build and Test
- run: |
- docker build -t apache/apisix-dashboard:whole -f ./all-in-one/apisix-dashboard/Dockerfile .
- docker run -v `pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -v `pwd`/all-in-one/apisix-dashboard/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml -p 9080:9080 -p 2379:2379 -p 9000:9000 -d apache/apisix-dashboard:whole
- sleep 30
- curl http://127.0.0.1:9080/apisix/admin/schema/service -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1'
- curl http://127.0.0.1:9000
diff --git a/.github/workflows/dashboard_push_docker_hub.yaml b/.github/workflows/dashboard_push_docker_hub.yaml
deleted file mode 100644
index 4d9a432..0000000
--- a/.github/workflows/dashboard_push_docker_hub.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Push apisix dashboard to Docker image
-on:
- push:
- branches: ['release/apisix-dashboard**']
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Check out the repo
- uses: actions/checkout@v2
-
- - name: Login to Docker Hub
- uses: docker/login-action@v1
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
-
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
-
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
-
- - name: Push apisix dashboard image to Docker Hub
- run: |
- make push-multiarch-dashboard
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 3a283bb..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: ❄️ Lint
-
-on: [pull_request]
-
-jobs:
- markdownlint:
- name: 🍇 Markdown
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: 🚀 Use Node.js
- uses: actions/setup-node@v1
- with:
- node-version: '12.x'
- - run: npm install -g markdownlint-cli@0.25.0
- - run: markdownlint '**/*.md' --ignore node_modules
diff --git a/.github/workflows/linux_alpine_ci.yaml b/.github/workflows/linux_alpine_ci.yaml
deleted file mode 100644
index 7239ce5..0000000
--- a/.github/workflows/linux_alpine_ci.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Docker compose alpine CI on linux
-
-on:
- push:
- branches: [ master, kv/alpine ]
- pull_request:
- branches: [ master ]
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: use docker-compose
- run: cd ./example && docker-compose -f docker-compose-alpine.yml -p docker-apisix up -d
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
deleted file mode 100644
index dc15281..0000000
--- a/.github/workflows/linux_ci.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Docker compose CI on linux
-
-on:
- push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: use docker-compose
- run: cd ./example && docker-compose -p docker-apisix up -d
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index 38fe3d7..0000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-on:
- workflow_dispatch:
- schedule:
- - cron: '0 10 * * *'
-
-jobs:
- prune_stale:
- name: Prune Stale
- runs-on: ubuntu-latest
-
- steps:
- - name: Prune Stale
- uses: actions/stale@v4.0.0
- with:
- days-before-issue-stale: 30
- days-before-issue-close: 14
- stale-issue-message: >
- This issue has been marked as stale due to 30 days of inactivity.
- It will be closed in 2 weeks if no further activity occurs. If this
- issue is still relevant, please simply write any comment. Even if
- closed, you can still revive the issue at any time or discuss it
- on the dev@apisix.apache.org list.
- Thank you for your contributions.
- close-issue-message: >
- This issue has been closed due to lack of activity. If you think
- that is incorrect, or the issue requires additional review, you
- can revive the issue at any time.
- days-before-pr-stale: 60
- days-before-pr-close: 28
- stale-pr-message: >
- This pull request has been marked as stale due to 60 days of
- inactivity. It will be closed in 4 weeks if no further activity
- occurs. If you think that's incorrect or this pull request should
- instead be reviewed, please simply write any comment. Even if
- closed, you can still revive the PR at any time ordiscuss it on
- the dev@apisix.apache.org list.
- Thank you for your contributions.
- close-pr-message: >
- This pull request/issue has been closed due to lack of activity.
- If you think that is incorrect, or the pull request requires
- review, you can revive the PR at any time.
- # Issues with these labels will never be considered stale.
- exempt-issue-labels: 'bug,enhancement,good first issue'
- stale-issue-label: 'stale'
- stale-pr-label: 'stale'
- ascending: true