diff --git a/README.md b/README.md index 37be75b66..e0182457b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ### Quick start * prebuilt docker image https://hub.docker.com/r/apache/dubbo-admin -* quick start a live demo with [play-with-docker](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/apache/dubbo-admin/develop/docker/stack.yml#) (version:0.1.0) +* quick start a live demo with [play-with-docker](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/apache/dubbo-admin/develop/docker/stack.yml#) (version:0.3.0) ### Screenshot diff --git a/README_ZH.md b/README_ZH.md index f4f0d909d..c1a21d10f 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -8,7 +8,7 @@ ### 快速开始 * 预构建的Docker镜像 https://hub.docker.com/r/apache/dubbo-admin -* 快速启动一个演示环境 [play-with-docker](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/apache/dubbo-admin/develop/docker/stack.yml#) (版本:0.1.0) +* 快速启动一个演示环境 [play-with-docker](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/apache/dubbo-admin/develop/docker/stack.yml#) (版本:0.3.0) ### 页面截图 diff --git a/docker/0.3.0/Dockerfile b/docker/0.3.0/Dockerfile index 5432d3dde..ac31116d3 100644 --- a/docker/0.3.0/Dockerfile +++ b/docker/0.3.0/Dockerfile @@ -14,16 +14,15 @@ # limitations under the License. FROM maven:3-openjdk-8 -RUN mkdir -p /source/dubbo-admin-snapshot -ADD . /source/dubbo-admin-snapshot -WORKDIR /source/dubbo-admin-snapshot -RUN mvn --batch-mode -Prelease clean package -Dmaven.test.skip=true +RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.3.0.zip && unzip -q 0.3.0.zip -d /source +WORKDIR /source/dubbo-admin-0.3.0 +RUN mvn --batch-mode clean package -Dmaven.test.skip=true FROM openjdk:8-jre LABEL maintainer="dev@dubbo.apache.org" RUN apt-get update && apt-get install -y tini -COPY --from=0 /source/dubbo-admin-snapshot/dubbo-admin-distribution/target/dubbo-admin-0.3.0.jar /app.jar -COPY --from=0 /source/dubbo-admin-snapshot/docker/entrypoint.sh /usr/local/bin/entrypoint.sh +COPY --from=0 /source/dubbo-admin-0.3.0/dubbo-admin-distribution/target/dubbo-admin-0.3.0.jar /app.jar +COPY --from=0 /source/dubbo-admin-0.3.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh ENV JAVA_OPTS "" diff --git a/docker/0.3.0/Dockerfile.test b/docker/0.3.0/Dockerfile.test new file mode 100644 index 000000000..dee4d1d35 --- /dev/null +++ b/docker/0.3.0/Dockerfile.test @@ -0,0 +1,23 @@ +# 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 ubuntu:trusty +RUN apt-get update && apt-get install -yq curl && apt-get clean + +WORKDIR /app + +ADD test.sh /app/test.sh + +CMD ["bash", "test.sh"] \ No newline at end of file diff --git a/docker/0.3.0/docker-compose.test.yml b/docker/0.3.0/docker-compose.test.yml new file mode 100644 index 000000000..9ac7fec20 --- /dev/null +++ b/docker/0.3.0/docker-compose.test.yml @@ -0,0 +1,33 @@ +# 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. + +zookeeper: + image: zookeeper:3.5 +admin: + build: . + dockerfile: Dockerfile + links: + - zookeeper + environment: + - admin.registry.address=zookeeper://zookeeper:2181 + - admin.config-center=zookeeper://zookeeper:2181 + - admin.metadata-report.address=zookeeper://zookeeper:2181 + ports: + - 8080 +sut: + build: . + dockerfile: Dockerfile.test + links: + - admin \ No newline at end of file diff --git a/docker/0.3.0/test.sh b/docker/0.3.0/test.sh new file mode 100755 index 000000000..d342e3550 --- /dev/null +++ b/docker/0.3.0/test.sh @@ -0,0 +1,34 @@ +# 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. + +LOOP_SIZE=60 +i=0 + +while [[ $i -lt LOOP_SIZE ]]; do + status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080) + + if [[ "$status_code" -eq 200 ]] ; then + echo "Tests passed!" + exit 0 + else + curl -v http://admin:8080 + echo "status is incorrect, waiting for next turn" + fi + sleep 5 + i=$i+1 +done + +echo "Tests failed!" +exit 1 \ No newline at end of file