[skywalking-docker] 11/45: Fix some issues

[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-docker.git

commit f8027aa8cfba0dee8d338f1a79aa54a626b07538
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu May 16 01:08:30 2019 +0800

    Fix some issues
---
 6/6.1/base/Dockerfile |  9 ++++++++-
 6/6.1/oap/Dockerfile  | 16 +++++-----------
 6/6.1/ui/Dockerfile   | 18 ++++++------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/6/6.1/base/Dockerfile b/6/6.1/base/Dockerfile
index ca4b47e..349c8b2 100644
--- a/6/6.1/base/Dockerfile
+++ b/6/6.1/base/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openjdk:8-jre-alpine
+FROM openjdk:8-jre-alpine AS build
 
 LABEL maintainer="hanahmily@apache.org"
 
@@ -88,3 +88,10 @@ RUN set -eux; \
 	command -v gpgconf && gpgconf --kill all || :; \
 	rm -rf "$GNUPGHOME"; \
     apk del .fetch-deps
+
+FROM openjdk:8-jre-alpine
+
+COPY --from=build /skywalking /skywalking
+
+RUN apk add --no-cache \
+    bash
\ No newline at end of file
diff --git a/6/6.1/oap/Dockerfile b/6/6.1/oap/Dockerfile
index 0ef7c18..42bbfc0 100644
--- a/6/6.1/oap/Dockerfile
+++ b/6/6.1/oap/Dockerfile
@@ -18,22 +18,16 @@ FROM apache/skywalking-base:6.1.0
 
 LABEL maintainer="hanahmily@apache.org"
 
-ENV DIST_NAME=apache-skywalking-apm-bin \
-    JAVA_OPTS=" -Xms256M " \
+ENV JAVA_OPTS=" -Xms256M " \
     SW_CLUSTER="standalone" \
     SW_STORAGE="h2"
 
-COPY "$DIST_NAME.tar.gz" /
-
-RUN set -ex; \
-    tar -xzf "$DIST_NAME.tar.gz"; \
-    rm -rf "$DIST_NAME.tar.gz"; \
-    rm -rf "$DIST_NAME/config/log4j2.xml"; \
-    rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/webapp"; rm -rf "$DIST_NAME/agent"; \
-    mv "$DIST_NAME" skywalking;
-
 WORKDIR skywalking
 
+RUN set -eux; \
+    rm -rf "config/log4j2.xml"; \
+    rm -rf "webapp"; rm -rf "agent";
+
 COPY log4j2.xml config/
 COPY docker-entrypoint.sh .
 
diff --git a/6/6.1/ui/Dockerfile b/6/6.1/ui/Dockerfile
index 546de27..9d720eb 100644
--- a/6/6.1/ui/Dockerfile
+++ b/6/6.1/ui/Dockerfile
@@ -14,26 +14,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM apache/skywalking-base:6.0.0-GA
+FROM apache/skywalking-base:6.1.0
 
 LABEL maintainer="hanahmily@apache.org"
 
-ENV DIST_NAME=apache-skywalking-apm-bin \
-    JAVA_OPTS=" -Xms256M " \
+ENV JAVA_OPTS=" -Xms256M " \
     SW_OAP_ADDRESS="127.0.0.1:12800" \
     SW_TIMEOUT="20000"
 
-COPY "$DIST_NAME.tar.gz" /
-
-RUN set -ex; \
-    tar -xzf "$DIST_NAME.tar.gz"; \
-    rm -rf "$DIST_NAME.tar.gz"; \
-    rm -rf "$DIST_NAME/config"; \
-    rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/oap-libs"; rm -rf "$DIST_NAME/agent"; \
-    mv "$DIST_NAME" skywalking;
-
 WORKDIR skywalking
 
+RUN set -eux; \
+    rm -rf "config"; rm -rf "oap-libs"; \
+    rm -rf "agent";
+
 COPY docker-entrypoint.sh .
 COPY logback.xml webapp/