Commit 8751c745 by yinyong

update commit

parent 2663ca8a
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
cluster: cluster:
standalone: # standalone:
# Please check your ZooKeeper is 3.5+, However, it is also compatible with ZooKeeper 3.4.x. Replace the ZooKeeper 3.5+ # Please check your ZooKeeper is 3.5+, However, it is also compatible with ZooKeeper 3.4.x. Replace the ZooKeeper 3.5+
# library the oap-libs folder with your ZooKeeper 3.4.x library. # library the oap-libs folder with your ZooKeeper 3.4.x library.
# zookeeper: # zookeeper:
...@@ -29,9 +29,9 @@ cluster: ...@@ -29,9 +29,9 @@ cluster:
# namespace: ${SW_CLUSTER_K8S_NAMESPACE:default} # namespace: ${SW_CLUSTER_K8S_NAMESPACE:default}
# labelSelector: ${SW_CLUSTER_K8S_LABEL:app=collector,release=skywalking} # labelSelector: ${SW_CLUSTER_K8S_LABEL:app=collector,release=skywalking}
# uidEnvName: ${SW_CLUSTER_K8S_UID:SKYWALKING_COLLECTOR_UID} # uidEnvName: ${SW_CLUSTER_K8S_UID:SKYWALKING_COLLECTOR_UID}
# consul: consul:
# serviceName: skywalking serviceName: skywalking
# hostPort: 172.31.255.119:8500,172.31.255.245:8500,172.31.255.177:8500 hostPort: 172.31.255.119:8500,172.31.255.245:8500,172.31.255.177:8500
core: core:
default: default:
# Mixed: Receive agent data, Level 1 aggregate, Level 2 aggregate # Mixed: Receive agent data, Level 1 aggregate, Level 2 aggregate
......
...@@ -40,9 +40,9 @@ RUN set -ex; \ ...@@ -40,9 +40,9 @@ RUN set -ex; \
rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/webapp"; rm -rf "$DIST_NAME/agent"; rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/webapp"; rm -rf "$DIST_NAME/agent";
WORKDIR $DIST_NAME WORKDIR $DIST_NAME
COPY /6.x/config/application.yml config/ COPY /docker-skywalking/6.x/config/application.yml config/
COPY /6.x/image-build/oap/log4j2.xml config/ COPY /docker-skywalking/6.x/image-build/oap/log4j2.xml config/
COPY /6.x/image-build/oap/docker-entrypoint.sh . COPY /docker-skywalking/6.x/image-build/oap/docker-entrypoint.sh .
EXPOSE 12800 11800 EXPOSE 12800 11800
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment