From 50ec820fdcda1150bc7972f88598ed59915db0ce Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Sat, 18 Aug 2018 09:03:49 +0800 Subject: [PATCH] Fix docker file CI failure. --- .gitignore | 1 + docker/Makefile | 15 +++++++++++++++ docker/snapshot/Dockerfile | 16 ++++++++++++++++ docker/snapshot/docker-entrypoint.sh | 16 ++++++++++++++++ docker/stack.yml | 16 ++++++++++++++++ 5 files changed, 64 insertions(+) diff --git a/.gitignore b/.gitignore index 8d6d2d3fdf..56e941580e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ packages/ **/dependency-reduced-pom.xml /skywalking-agent/ /dist/ +/docker/snapshot/*.gz diff --git a/docker/Makefile b/docker/Makefile index 85ca996e3c..30f159ce03 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,3 +1,18 @@ +# 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. snapshot: cd snapshot; \ diff --git a/docker/snapshot/Dockerfile b/docker/snapshot/Dockerfile index 47d661b421..59cbe6d736 100644 --- a/docker/snapshot/Dockerfile +++ b/docker/snapshot/Dockerfile @@ -1,3 +1,19 @@ +# 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 openjdk:8-jre-alpine ENV DIST_NAME=apache-skywalking-apm-incubating \ diff --git a/docker/snapshot/docker-entrypoint.sh b/docker/snapshot/docker-entrypoint.sh index 4f8225736d..451e9a8b7d 100755 --- a/docker/snapshot/docker-entrypoint.sh +++ b/docker/snapshot/docker-entrypoint.sh @@ -1,3 +1,19 @@ +# 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 -e diff --git a/docker/stack.yml b/docker/stack.yml index 0c0b9eac1f..63c25f7c34 100644 --- a/docker/stack.yml +++ b/docker/stack.yml @@ -1,3 +1,19 @@ +# 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. + version: '3.3' services: elasticsearch: -- GitLab