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 50ef014a1c02b83ed4d22083d35205fd3ff958a9 Author: gaohongtao <[email protected]> AuthorDate: Mon Nov 19 22:41:31 2018 +0800 Add oap and ui dockerfiles --- 6/6.0-alpha/oap/Dockerfile | 37 ++++++++++++++++++++++++++++++++++++ 6/6.0-alpha/oap/docker-entrypoint.sh | 28 +++++++++++++++++++++++++++ 6/6.0-alpha/oap/log4j2.xml | 35 ++++++++++++++++++++++++++++++++++ 6/6.0-alpha/ui/Dockerfile | 37 ++++++++++++++++++++++++++++++++++++ 6/6.0-alpha/ui/docker-entrypoint.sh | 21 ++++++++++++++++++++ 6/6.0-alpha/ui/logback.xml | 21 ++++++++++++++++++++ 6 files changed, 179 insertions(+) diff --git a/6/6.0-alpha/oap/Dockerfile b/6/6.0-alpha/oap/Dockerfile new file mode 100644 index 0000000..625f471 --- /dev/null +++ b/6/6.0-alpha/oap/Dockerfile @@ -0,0 +1,37 @@ +# 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. + +FROM skywalking/base:6.0.0-alpha + +LABEL maintainer="[email protected]" + +ENV SKYWALKING_HOME=/skywalking \ + JAVA_OPTS=" -Xms256M -Xmx512M" + +WORKDIR $SKYWALKING_HOME + +RUN set -eux; \ + apk add --no-cache --virtual \ + bash \ + rm -rf "config/log4j2.xml"; \ + rm -rf "webapp"; rm -rf "agent"; + +COPY log4j2.xml config/ +COPY docker-entrypoint.sh . + +EXPOSE 12800 11800 + +ENTRYPOINT ["sh", "docker-entrypoint.sh"] \ No newline at end of file diff --git a/6/6.0-alpha/oap/docker-entrypoint.sh b/6/6.0-alpha/oap/docker-entrypoint.sh new file mode 100644 index 0000000..f3f19e0 --- /dev/null +++ b/6/6.0-alpha/oap/docker-entrypoint.sh @@ -0,0 +1,28 @@ +# 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. + +#!/bin/bash + +set -ex + +CLASSPATH="config:$CLASSPATH" +for i in oap-libs/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done + +exec java ${JAVA_OPTS} -classpath $CLASSPATH \ + org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@" \ No newline at end of file diff --git a/6/6.0-alpha/oap/log4j2.xml b/6/6.0-alpha/oap/log4j2.xml new file mode 100644 index 0000000..b1f1818 --- /dev/null +++ b/6/6.0-alpha/oap/log4j2.xml @@ -0,0 +1,35 @@ +<?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.elasticsearch.common.network.IfConfig" level="INFO"/> + <logger name="io.grpc.netty" level="INFO"/> + <Root level="INFO"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/6/6.0-alpha/ui/Dockerfile b/6/6.0-alpha/ui/Dockerfile new file mode 100644 index 0000000..2476251 --- /dev/null +++ b/6/6.0-alpha/ui/Dockerfile @@ -0,0 +1,37 @@ +# 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. + +FROM skywalking/base:6.0.0-alpha + +LABEL maintainer="[email protected]" + +ENV SKYWALKING_HOME=/skywalking \ + JAVA_OPTS=" -Xms256M -Xmx512M" + +WORKDIR $SKYWALKING_HOME + +RUN set -eux; \ + apk add --no-cache --virtual \ + bash \ + rm -rf "config"; rm -rf "oap-libs"; \ + rm -rf "agent"; + +COPY docker-entrypoint.sh . +COPY logback.xml webapp/ + +EXPOSE 8080 + +ENTRYPOINT ["sh", "docker-entrypoint.sh"] \ No newline at end of file diff --git a/6/6.0-alpha/ui/docker-entrypoint.sh b/6/6.0-alpha/ui/docker-entrypoint.sh new file mode 100644 index 0000000..2a857b7 --- /dev/null +++ b/6/6.0-alpha/ui/docker-entrypoint.sh @@ -0,0 +1,21 @@ +# 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. + +#!/bin/bash + +set -ex + +exec java -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@" \ No newline at end of file diff --git a/6/6.0-alpha/ui/logback.xml b/6/6.0-alpha/ui/logback.xml new file mode 100644 index 0000000..834036d --- /dev/null +++ b/6/6.0-alpha/ui/logback.xml @@ -0,0 +1,21 @@ +<?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> + <include resource="org/springframework/boot/logging/logback/base.xml" /> +</configuration> \ No newline at end of file
