kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed docker image can't run (#2275) 

- Set WORKDIR to skywalking
 - Change base image to openjdk:8u181-jdk-stretch which contains java tool-chains
This commit is contained in:
Gao Hongtao 2019-02-22 10:48:41 +08:00 committed by 吴晟 Wu Sheng
parent bb800863f2
commit f0a96f5f09
4 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/Makefile
View File

@ -14,16 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
export DOCKER_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
oap:
cd oap; \
cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./skywalking.tar.gz ; \
cd $(DOCKER_ROOT)/oap; \
cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
docker build -t skywalking/oap:latest .
ui:
cd ui; \
cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./skywalking.tar.gz ; \
cd $(DOCKER_ROOT)/ui; \
cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
docker build -t skywalking/ui:latest .
build: oap ui
.PHONY: oap ui

16
docker/oap/Dockerfile
View File

@ -14,23 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM openjdk:8-jre-alpine
FROM openjdk:8u181-jdk-stretch
ENV DIST_NAME=skywalking \
ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
JAVA_OPTS=" -Xms256M "
# Install required packages
RUN apk add --no-cache \
bash
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";
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 $DIST_NAME
WORKDIR skywalking
COPY log4j2.xml config/
COPY docker-entrypoint.sh .

16
docker/ui/Dockerfile
View File

@ -14,23 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM openjdk:8-jre-alpine
FROM openjdk:8u181-jdk-stretch
ENV DIST_NAME=skywalking \
ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
JAVA_OPTS=" -Xms256M "
# Install required packages
RUN apk add --no-cache \
bash
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";
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 $DIST_NAME
WORKDIR skywalking
COPY docker-entrypoint.sh .
COPY logback.xml webapp/

3
docker/ui/docker-entrypoint.sh
View File

@ -18,5 +18,4 @@
set -ex
exec java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
-jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"
exec java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"