From fe58b1ad5afb260d0f146fbe2f0d68b843cdcf81 Mon Sep 17 00:00:00 2001
From: heyanlong <yanlong.hee@gmail.com>
Date: Sun, 22 Mar 2020 10:40:20 +0800
Subject: [PATCH] Update Dockerfile

---
 Dockerfile                | 8 ++++++--
 agent/service/register.go | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a822ca..76e9ddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex \
     libcurl4-openssl-dev \
     golang \
     git \
-    procps \
     nginx \
     && rm -rf /var/lib/apt/lists/*
 ADD . /tmp/skywalking
@@ -18,7 +17,12 @@ RUN set -ex \
     && cp php.ini /usr/local/etc/php/conf.d/ext-skywalking.ini \
     && cp service.sh /opt/ \
     && cp nginx.conf /etc/nginx/nginx.conf \
+    && cp skywalking.php /opt/www/index.php \
     && cd /var/www/html \
-    && rm -fr /tmp/skywalking
+    && apt-get remove golang git \
+    && rm -fr /tmp/skywalking \
+    && rm -fr /usr/lib/go-1.11 \
+    && rm -fr /root/go \
+    && rm -fr /root/.cache
 
 ENTRYPOINT ["/opt/service.sh"]
\ No newline at end of file
diff --git a/agent/service/register.go b/agent/service/register.go
index 8a3e343..d10fa0b 100644
--- a/agent/service/register.go
+++ b/agent/service/register.go
@@ -221,7 +221,7 @@ func (t *Agent) doRegister(r *register) {
 
 				for _, ip := range ip4s() {
 					properties = append(properties, &common.KeyStringValuePair{
-						Key:   "ipv4s",
+						Key:   "ipv4",
 						Value: ip,
 					})
 				}
-- 
GitLab