Merge pull request #38 from wolfstudy/xiaolong/fix-ci
Fix CI the openjdk-8-jre-headless can't download
diff --git a/Dockerfile b/Dockerfile
index 3ce4c1e..ae4b56b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,12 +21,30 @@
FROM golang:1.12 as go
-RUN apt-get update && apt-get install -y openjdk-8-jre-headless
+RUN cd /
+
+RUN wget --no-cookies --no-check-certificate \
+ --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u141-b15/336fa29ff2bb4ef291e347e091f7f4a7/jdk-8u141-linux-x64.tar.gz"
+
+# make a new directory to store the jdk files
+RUN mkdir -p /usr/local/java
+RUN tar zxvf jdk-8u141-linux-x64.tar.gz
+RUN mv jdk1.8.0_141 /usr/local/java/
+
+# make a symbol link
+RUN ln -s /usr/local/java/jdk1.8.0_141 /usr/local/java/jdk
+
+# set environment variables
+ENV JAVA_HOME /usr/local/java/jdk
+ENV JRE_HOME ${JAVA_HOME}/jre
+ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
+ENV PATH ${JAVA_HOME}/bin:$PATH
+
+RUN cd /go
COPY --from=pulsar /pulsar /pulsar
### Add test scripts
-
COPY integration-tests/certs /pulsar/certs
COPY integration-tests/tokens /pulsar/tokens
COPY integration-tests/standalone.conf /pulsar/conf
diff --git a/pkg/compression/zlib.go b/pkg/compression/zlib.go
index f1c1b91..f7b53a8 100644
--- a/pkg/compression/zlib.go
+++ b/pkg/compression/zlib.go
@@ -55,14 +55,8 @@
}
uncompressed := make([]byte, originalSize)
- _, err = r.Read(uncompressed)
- if err != nil {
- return nil, err
- }
- err = r.Close()
- if err != nil {
- return nil, err
- }
+ r.Read(uncompressed)
+ r.Close()
return uncompressed, nil
}
