Merge branch 'master' into fix_flaky

.github/workflows/docker-tests.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 1
       - id: set-matrix
         name: Generate outputs.matrix from pom.xml listing
-        run: echo "::set-output name=matrix::{\"include\":$(.github/workflows/targets-as-json)}"
+        run: echo "::set-output name=matrix::{\"include\":$(.github/workflows/docker/targets-as-json)}"
   build-and-verify-docker:
     name: Build and verify Docker images
     needs: discover-targets
@@ -50,7 +50,7 @@ jobs:
       - name: Verify Docker image openzipkin/${{ matrix.target }}:test
         run: |
           # This just makes sure containers run and the HEALTHCHECK works (for now..)
-          COMPOSE_FILE=./.github/workflows/docker-compose-${{ matrix.target }}.yml
+          COMPOSE_FILE=./.github/workflows/docker/docker-compose-${{ matrix.target }}.yml
           if test -f "${COMPOSE_FILE}"; then
             docker-compose -f "${COMPOSE_FILE}" up -d --quiet-pull
           else

docker/bin/block-on-health

@@ -1,4 +1,18 @@
 #!/bin/sh
+#
+# Copyright 2015-2020 The OpenZipkin Authors
+#
+# Licensed 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.
+#
+
 
 set -ue
 

docker/bin/install.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
+# Copyright 2015-2020 The OpenZipkin Authors
 #
 # Licensed 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

docker/bin/targets-to-build

@@ -1,4 +1,18 @@
 #!/bin/sh
+#
+# Copyright 2015-2020 The OpenZipkin Authors
+#
+# Licensed 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.
+#
+
 
 set -ue
 

docker/build_image

@@ -1,4 +1,18 @@
 #!/bin/sh
+#
+# Copyright 2015-2020 The OpenZipkin Authors
+#
+# Licensed 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.
+#
+
 # This script is only a convenience as the build environment is controlled in
 # the Dockerfile. That said, it uses only basic shell commands to help it work
 # on developer laptops as well as CI nodes. Mainly, this centralizes the base

docker/examples/docker-compose-example.yml

@@ -1,3 +1,17 @@
+#
+# Copyright 2015-2020 The OpenZipkin Authors
+#
+# Licensed 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.
+#
+
 # Format version 2.1 was introduced with Docker Compose v1.9
 # We need Docker Compose v1.9+ for unset variable interpolation
 version: "2.1"

docker/lens/docker-bin/start-nginx

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2015-2019 The OpenZipkin Authors
+# Copyright 2015-2020 The OpenZipkin Authors
 #
 # Licensed 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

pom.xml

@@ -651,14 +651,18 @@
                 <bnd>SCRIPT_STYLE</bnd>
                 <ejs>XML_STYLE</ejs>
                 <css>SLASHSTAR_STYLE</css>
-                <Dockerfile.release>SCRIPT_STYLE</Dockerfile.release>
-                <post_push>SCRIPT_STYLE</post_push>
                 <build>SCRIPT_STYLE</build>
-                <install>SCRIPT_STYLE</install>
+                <push>SCRIPT_STYLE</push>
                 <docker-healthcheck>SCRIPT_STYLE</docker-healthcheck>
+                <block-on-health>SCRIPT_STYLE</block-on-health>
+                <targets-to-build>SCRIPT_STYLE</targets-to-build>
+                <build_image>SCRIPT_STYLE</build_image>
                 <start-cassandra>SCRIPT_STYLE</start-cassandra>
+                <start-elasticsearch>SCRIPT_STYLE</start-elasticsearch>
                 <start-kafka-zookeeper>SCRIPT_STYLE</start-kafka-zookeeper>
                 <start-mysql>SCRIPT_STYLE</start-mysql>
+                <start-nginx>SCRIPT_STYLE</start-nginx>
+                <start-zipkin>SCRIPT_STYLE</start-zipkin>
               </mapping>
               <excludes>
                 <exclude>**/simplelogger.properties</exclude>