[skywalking-nodejs] branch master updated: Use agent test tool snapshot Docker image instead of building in CI (#59)

[wu...@apache.org]

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

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-nodejs.git


The following commit(s) were added to refs/heads/master by this push:
     new e698fc1  Use agent test tool snapshot Docker image instead of building in CI (#59)
e698fc1 is described below

commit e698fc180bdc1564f0baa74390a8c2be9a6cdc5b
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Jul 20 22:30:33 2021 +0800

    Use agent test tool snapshot Docker image instead of building in CI (#59)
---
 package-lock.json                     |  2 +-
 package.json                          |  2 +-
 tests/plugins/common/Dockerfile.tool  | 44 -----------------------------------
 tests/plugins/common/base-compose.yml |  4 +---
 4 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index add91e0..394656b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "skywalking-backend-js",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 783d57b..68364e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "skywalking-backend-js",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "The NodeJS agent for Apache SkyWalking",
   "homepage": "skywalking.apache.org",
   "main": "lib/index.js",
diff --git a/tests/plugins/common/Dockerfile.tool b/tests/plugins/common/Dockerfile.tool
deleted file mode 100644
index e88d0ca..0000000
--- a/tests/plugins/common/Dockerfile.tool
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FROM openjdk:8
-
-WORKDIR /tests
-
-ARG COMMIT_HASH=8a48c49b4420df5c9576d2aea178b2ebcb7ecd09
-
-ADD https://github.com/apache/skywalking-agent-test-tool/archive/${COMMIT_HASH}.tar.gz .
-
-RUN tar -xf ${COMMIT_HASH}.tar.gz --strip 1
-
-RUN rm ${COMMIT_HASH}.tar.gz
-
-RUN ./mvnw -B -DskipTests package
-
-FROM openjdk:8
-
-EXPOSE 19876 12800
-
-WORKDIR /tests
-
-COPY --from=0 /tests/dist/skywalking-mock-collector.tar.gz /tests
-
-RUN tar -xf skywalking-mock-collector.tar.gz --strip 1
-
-RUN chmod +x bin/collector-startup.sh
-
-ENTRYPOINT bin/collector-startup.sh
diff --git a/tests/plugins/common/base-compose.yml b/tests/plugins/common/base-compose.yml
index 677493b..6e72ce1 100644
--- a/tests/plugins/common/base-compose.yml
+++ b/tests/plugins/common/base-compose.yml
@@ -19,9 +19,7 @@ version: '2.1'
 
 services:
   collector:
-    build:
-      context: ../../../
-      dockerfile: tests/plugins/common/Dockerfile.tool
+    image: ghcr.io/apache/skywalking-agent-test-tool/mock-collector:2ed17bb73eb993cc7d4effa7a5a36dd91a9ec8cd
     ports:
       - 12800:12800
     networks: