[skywalking] branch ci/disk-problem updated (025b12d -> 85c68bd)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch ci/disk-problem
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 025b12d  Try to work around the testcontainers bug
 discard 8d3e6e2  Try to work around the testcontainers bug
 discard fc993d1  Try to work around the testcontainers bug
 discard c773847  Try to clean up before test
 discard d00af40  Try to reproduce disk problem
     new 85c68bd  test: work around the testcontainers bug

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (025b12d)
            \
             N -- N -- N   refs/heads/ci/disk-problem (85c68bd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:

[skywalking] 01/01: test: work around the testcontainers bug

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch ci/disk-problem
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 85c68bd6349d1b96cb4e1e37965ff4b5e63d3b83
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Sun Nov 8 21:28:20 2020 +0800

    test: work around the testcontainers bug
---
 .github/workflows/e2e.yaml                      | 1 +
 test/e2e/e2e-test/docker/lua/Dockerfile.nginx   | 2 +-
 test/e2e/e2e-test/docker/lua/docker-compose.yml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index e53e2d5..aa51bcf 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -25,6 +25,7 @@ on:
   push:
     branches:
       - master
+      - ci/disk-problem
 
 env:
   SKIP_TEST: true
diff --git a/test/e2e/e2e-test/docker/lua/Dockerfile.nginx b/test/e2e/e2e-test/docker/lua/Dockerfile.nginx
index 3307bcf..b7b32f0 100644
--- a/test/e2e/e2e-test/docker/lua/Dockerfile.nginx
+++ b/test/e2e/e2e-test/docker/lua/Dockerfile.nginx
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openresty/openresty
+FROM openresty/openresty:1.17.8.2-5-alpine-fat
 
 ENV COMMIT_HASH=cda47ae0a507ab86a378a298325c3c94d9a773c2
 
diff --git a/test/e2e/e2e-test/docker/lua/docker-compose.yml b/test/e2e/e2e-test/docker/lua/docker-compose.yml
index ac600ef..a07753c 100644
--- a/test/e2e/e2e-test/docker/lua/docker-compose.yml
+++ b/test/e2e/e2e-test/docker/lua/docker-compose.yml
@@ -66,7 +66,7 @@ services:
         condition: service_healthy
     volumes:
       - ../lua/nginx.conf:/var/nginx/conf.d/nginx.conf
-    entrypoint: ['bash', '-c', 'sleep 5 && /usr/bin/openresty -c /var/nginx/conf.d/nginx.conf']
+    entrypoint: ['bash', '-c', 'sleep 5 && openresty -c /var/nginx/conf.d/nginx.conf']
 
 networks:
   e2e: