diff --git a/6/6.0-alpha/oap/Dockerfile b/6/6.0-alpha/oap/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..625f471443b6159ddf8b0d460d1370e6296cd1aa --- /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="hanahmily@apache.org" + +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 0000000000000000000000000000000000000000..f3f19e0838c741f161bc4779590a80b3cc44577f --- /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 0000000000000000000000000000000000000000..b1f18186374f061543a56f6ef2fbf60af9a0fc90 --- /dev/null +++ b/6/6.0-alpha/oap/log4j2.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + \ 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 0000000000000000000000000000000000000000..2476251e027353ba75f752aa29d85c3f5359719a --- /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="hanahmily@apache.org" + +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 0000000000000000000000000000000000000000..2a857b7c65a04d67350accf331f43597a704eb33 --- /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 0000000000000000000000000000000000000000..834036d7bf278b7c8b6015afa6bd02acc2d04d33 --- /dev/null +++ b/6/6.0-alpha/ui/logback.xml @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file