Merge pull request #885 from ascrutae/fix/remove-docker

Remove docker document and docker plugin

Merge pull request #885 from ascrutae/fix/remove-docker
Remove docker document and docker plugin
f436c99e · wu-sheng · GitHub · beda5261 · 26d108d8 · beda5261
12 changed file
--- a/apm-collector/apm-collector-boot/docker/Dockerfile
+++ b/apm-collector/apm-collector-boot/docker/Dockerfile
-FROM openjdk:8u111-jdk
-
-ENV ZK_ADDRESSES=127.0.0.1:2181 \
-    ES_CLUSTER_NAME=CollectorDBCluster \
-    ES_ADDRESSES=localhost:9300 \
-    BIND_HOST=localhost  \
-    NAMING_BIND_HOST=localhost \
-    NAMING_BIND_PORT=10800 \
-    REMOTE_BIND_PORT=11800 \
-    AGENT_GRPC_BIND_PORT=11800 \
-    AGENT_JETTY_BIND_HOST=localhost \
-    AGENT_JETTY_BIND_PORT=12800 \
-    UI_JETTY_BIND_PORT=12800 \
-    UI_JETTY_BIND_HOST=localhost
-
-ADD skywalking-collector.tar.gz /usr/local
-COPY collectorService.sh /usr/local/skywalking-collector/bin
-COPY log4j2.xml /usr/local/skywalking-collector/config
-COPY application.yml /usr/local/skywalking-collector/config
-COPY docker-entrypoint.sh /
-
-RUN chmod +x /usr/local/skywalking-collector/bin/collectorService.sh && chmod +x /docker-entrypoint.sh
-
-EXPOSE 10800
-EXPOSE 11800
-EXPOSE 12800
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/usr/local/skywalking-collector/bin/collectorService.sh"]
--- a/apm-collector/apm-collector-boot/docker/application.yml
+++ b/apm-collector/apm-collector-boot/docker/application.yml
-cluster:
-  zookeeper:
-    hostPort: {ZK_ADDRESSES}
-    sessionTimeout: 100000
-naming:
-  jetty:
-    host: {NAMING_BIND_HOST}
-    port: {NAMING_BIND_PORT}
-    context_path: /
-remote:
-  gRPC:
-    host: {BIND_HOST}
-    port: {REMOTE_BIND_PORT}
-agent_gRPC:
-  gRPC:
-    host: {BIND_HOST}
-    port: {AGENT_GRPC_BIND_PORT}
-agent_jetty:
-  jetty:
-    host: {AGENT_JETTY_BIND_HOST}
-    port: {AGENT_JETTY_BIND_PORT}
-    context_path: /
-agent_stream:
-  default:
-    buffer_file_path: ../buffer/
-    buffer_offset_max_file_size: 10M
-    buffer_segment_max_file_size: 500M
-ui:
-  jetty:
-    host: {UI_JETTY_BIND_HOST}
-    port: {UI_JETTY_BIND_PORT}
-    context_path: /
-storage:
-  elasticsearch:
-    cluster_name: {ES_CLUSTER_NAME}
-    cluster_transport_sniffer: true
-    cluster_nodes: {ES_ADDRESSES}
-    index_shards_number: 2
-    index_replicas_number: 0
-    ttl: 7
--- a/apm-collector/apm-collector-boot/docker/collectorService.sh
+++ b/apm-collector/apm-collector-boot/docker/collectorService.sh
-#!/usr/bin/env sh
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-COLLECT_LOG_DIR="${COLLECTOR_HOME}/logs"
-JAVA_OPTS=" -Xms256M -Xmx512M"
-
-if [ ! -d "${COLLECTOR_HOME}/logs" ]; then
-    mkdir -p "${COLLECT_LOG_DIR}"
-fi
-
-_RUNJAVA=${JAVA_HOME}/bin/java
-[ -z "$JAVA_HOME" ] && _RUNJAVA=java
-
-CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH"
-for i in "$COLLECTOR_HOME"/libs/*.jar
-do
-    CLASSPATH="$i:$CLASSPATH"
-done
-
-${_RUNJAVA} ${JAVA_OPTS} -classpath $CLASSPATH org.apache.skywalking.apm.collector.boot.CollectorBootStartUp
--- a/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
+++ b/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
-#!/bin/sh
-
-echo "replace {ZK_ADDRESSES} to ${ZK_ADDRESSES}"
-eval sed -i -e 's/\{ZK_ADDRESSES\}/${ZK_ADDRESSES}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {ES_CLUSTER_NAME} to ${ES_CLUSTER_NAME}"
-eval sed -i -e 's/\{ES_CLUSTER_NAME\}/${ES_CLUSTER_NAME}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {ES_ADDRESSES} to ${ES_ADDRESSES}"
-eval sed -i -e 's/\{ES_ADDRESSES\}/${ES_ADDRESSES}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {BIND_HOST} to ${BIND_HOST}"
-eval sed -i -e 's/\{BIND_HOST\}/${BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {NAMING_BIND_HOST} to ${NAMING_BIND_HOST}"
-eval sed -i -e 's/\{NAMING_BIND_HOST\}/${NAMING_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {NAMING_BIND_PORT} to ${NAMING_BIND_PORT}"
-eval sed -i -e 's/\{NAMING_BIND_PORT\}/${NAMING_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {REMOTE_BIND_PORT} to ${REMOTE_BIND_PORT}"
-eval sed -i -e 's/\{REMOTE_BIND_PORT\}/${REMOTE_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {AGENT_GRPC_BIND_PORT} to ${AGENT_GRPC_BIND_PORT}"
-eval sed -i -e 's/\{AGENT_GRPC_BIND_PORT\}/${AGENT_GRPC_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {AGENT_JETTY_BIND_HOST} to ${AGENT_JETTY_BIND_HOST}"
-eval sed -i -e 's/\{AGENT_JETTY_BIND_HOST\}/${AGENT_JETTY_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {AGENT_JETTY_BIND_PORT} to ${AGENT_JETTY_BIND_PORT}"
-eval sed -i -e 's/\{AGENT_JETTY_BIND_PORT\}/${AGENT_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {UI_JETTY_BIND_PORT} to ${UI_JETTY_BIND_PORT}"
-eval sed -i -e 's/\{UI_JETTY_BIND_PORT\}/${UI_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {UI_JETTY_BIND_HOST} to ${UI_JETTY_BIND_HOST}"
-eval sed -i -e 's/\{UI_JETTY_BIND_HOST\}/${UI_JETTY_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-
-exec "$@"
--- a/apm-collector/apm-collector-boot/docker/log4j2.xml
+++ b/apm-collector/apm-collector-boot/docker/log4j2.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  ~
-  -->
-
-<Configuration status="info">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <logger name="org.eclipse.jetty" level="INFO"/>
-        <logger name="org.apache.zookeeper" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer" level="INFO"/>
-        <logger name="io.grpc.netty" level="INFO"/>
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -227,27 +227,6 @@
                    </execution>
                </executions>
            </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
-                <configuration>
-                    <skipDocker>false</skipDocker>
-                    <imageName>${docker.image.name}</imageName>
-                    <imageTags>
-                        <imageTag>${docker.image.version}</imageTag>
-                    </imageTags>
-                    <dockerDirectory>${project.basedir}/docker</dockerDirectory>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.basedir}/../../packages</directory>
-                            <include>${build.finalName}.tar.gz</include>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
        </plugins>
    </build>
 </project>
--- a/docker-compose.yml
+++ b/docker-compose.yml
-version: '2.1'
-services:
-  skywalking-webui:
-    image: skywalking/skywalking-ui:5.0.0-alpha
-    expose:
-      - "8080"
-    ports:
-      - "8080:8080"
-    links:
-      - skywalking-collector
-    depends_on:
-      skywalking-collector:
-        condition: service_healthy
-    environment:
-      - COLLECTOR_SERVERS=skywalking-collector:10800
-
-  skywalking-collector:
-    image: skywalking/skywalking-collector:5.0.0-alpha
-    expose:
-      - "10800"
-      - "11800"
-      - "12800"
-    ports:
-      - "12800:12800"
-      - "11800:11800"
-      - "10800:10800"
-    depends_on:
-      es-server:
-        condition: service_healthy
-      zookeeper-server:
-        condition: service_healthy
-    links:
-      - es-server
-      - zookeeper-server
-    environment:
-      - ZK_ADDRESSES=zookeeper-server:2181
-      - ES_ADDRESSES=es-server:9300
-      - BIND_HOST=0.0.0.0
-      - AGENT_JETTY_BIND_HOST=skywalking-collector
-      - NAMING_BIND_HOST=skywalking-collector
-      - UI_JETTY_BIND_HOST=skywalking-collector
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://skywalking-collector:10800/agent/gRPC"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-
-  zookeeper-server:
-    image: zookeeper:3.4.9
-    expose:
-      - "2181"
-    ports:
-      - "2181:2181"
-    healthcheck:
-      test: ["CMD", "/zookeeper-3.4.9/bin/zkServer.sh", "status"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-
-  es-server:
-    image: elasticsearch:5.3
-    command: "-Enode.name=TestNode -Enetwork.host=0.0.0.0 -Ehttp.cors.enabled=true -Ehttp.cors.allow-origin=* -Ethread_pool.bulk.queue_size=1000 -Ecluster.name=CollectorDBCluster"
-    environment:
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-    expose:
-      - "9200"
-      - "9300"
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9200"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,7 +3,6 @@

  * Getting Started
    * [Quick start](en/Quick-start.md)
-    * [Deploy docker image](en/Deploy-docker-image.md)
    * [Supported middlewares, frameworks and libraries](Supported-list.md)
      * [How to disable plugins?](en/How-to-disable-plugin.md)
  * Application Toolkit

--- a/docs/README_ZH.md
+++ b/docs/README_ZH.md
@@ -3,7 +3,6 @@

  * [项目简介](/README_ZH.md)
  * [快速入门](cn/Quick-start-CN.md)
-  * [部署Collector镜像](cn/Deploy-docker-image-CN.md)
  * [中间件，框架与类库支持列表](Supported-list.md)
    * [如何关闭特定插件](cn/How-to-disable-plugin-CN.md)
  * APM相关介绍资料

--- a/docs/cn/Deploy-docker-image-CN.md
+++ b/docs/cn/Deploy-docker-image-CN.md
- [下载Source code](https://github.com/apache/incubator-skywalking/releases)并解压，进入解压目录，执行以下命令：
-
-```shell
-> docker-compose pull
-> docker-compose up
-```
- 探针配置的端口是10800。
- 通过http://localhost:8080 访问WebUI
-
-注意：Docker Compose主要用于在本地进行快速环境搭建和测试，请不要通过远程访问默认Docker Compose启动的Collector环境
-
-___
-测试环境： docker 17.03.1-ce， docker compose 1.11.2
--- a/docs/en/Deploy-docker-image.md
+++ b/docs/en/Deploy-docker-image.md
- [Download source code](https://github.com/apache/incubator-skywalking/releases) and unzip source package. Execute following command under the unzipped directory.
- 
-```shell
-> docker-compose pull
-> docker-compose up
-```
- The REST-service of collector listening on localhost:10800
- Open http://localhost:8080
-
-Attention: The Docker Compose is only designed for you to run collector in your local machine. If you are running by using our provided docker compose, you can't access the ip:10800.
-
---
-
-Test environment : docker 17.03.1-ce, docker compose 1.11.2
--- a/pom.xml
+++ b/pom.xml
@@ -252,14 +252,6 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
-                <configuration>
-                    <skipDocker>true</skipDocker>
-                </configuration>
-            </plugin>
            <plugin>
                <artifactId>maven-checkstyle-plugin</artifactId>
                <version>2.17</version>