From ae85a47b7baac7ef70cb18f744b95ac97bab3c3e Mon Sep 17 00:00:00 2001 From: Patrick Double Date: Tue, 30 Oct 2018 16:41:27 -0500 Subject: [PATCH 1/8] Initial commit --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. From 2523af2cc9c56226f7337223012da30cf5535d7b Mon Sep 17 00:00:00 2001 From: Patrick Double Date: Tue, 30 Oct 2018 16:43:31 -0500 Subject: [PATCH 2/8] initial working version --- Dockerfile | 23 ++++++++++++++++++++++ hooks/build | 10 ++++++++++ hooks/env | 14 +++++++++++++ opt/cruise-control/config/log4j.properties | 7 +++++++ opt/cruise-control/config/log4j2.xml | 13 ++++++++++++ opt/cruise-control/start.sh | 4 ++++ 6 files changed, 71 insertions(+) create mode 100644 Dockerfile create mode 100755 hooks/build create mode 100755 hooks/env create mode 100644 opt/cruise-control/config/log4j.properties create mode 100644 opt/cruise-control/config/log4j2.xml create mode 100755 opt/cruise-control/start.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e4935af --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM gradle:4.8-jdk8-slim +ARG VERSION=2.0.6 +USER root +RUN apt-get update && apt-get install -y git +RUN git clone -b ${VERSION} https://github.com/linkedin/cruise-control.git +RUN cd cruise-control && gradle jar copyDependantLibs + +# The container is made to work with github.com/Yolean/kubernetes-kafka, so we try to use a common base +FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 +ARG SOURCE_REF +ARG SOURCE_TYPE +ARG DOCKERFILE_PATH +ARG VERSION=2.0.6 + +RUN mkdir -p /opt/cruise-control +COPY --from=0 /home/gradle/cruise-control/cruise-control/build/libs/cruise-control-${VERSION}.jar /opt/cruise-control/cruise-control/build/libs/cruise-control.jar +COPY --from=0 /home/gradle/cruise-control/config /opt/cruise-control/config +COPY --from=0 /home/gradle/cruise-control/kafka-cruise-control-start.sh /opt/cruise-control/ +COPY --from=0 /home/gradle/cruise-control/cruise-control/build/dependant-libs /opt/cruise-control/cruise-control/build/dependant-libs +COPY opt/cruise-control /opt/cruise-control/ + +EXPOSE 8090 +CMD [ "/opt/cruise-control/start.sh" ] diff --git a/hooks/build b/hooks/build new file mode 100755 index 0000000..04579b0 --- /dev/null +++ b/hooks/build @@ -0,0 +1,10 @@ +#!/bin/bash -xe + +. ./hooks/env + +docker build \ + --build-arg "SOURCE_REF=$GIT_SHA1" \ + --build-arg "DOCKERFILE_PATH=$DOCKERFILE_PATH" \ + --build-arg "SOURCE_TYPE=$SOURCE_TYPE" \ + ${VERSION:+--build-arg "VERSION=$VERSION"} \ + -t $IMAGE_NAME $DOCKERFILE_PATH diff --git a/hooks/env b/hooks/env new file mode 100755 index 0000000..030a136 --- /dev/null +++ b/hooks/env @@ -0,0 +1,14 @@ +# These values are passed by the hub, but if they aren't we can get them from git. +[ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=${CIRCLE_TAG} +[ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD | tr '/' '-') +[ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=latest +[ -n "$GIT_SHA1" ] || GIT_SHA1=$(git rev-parse -q HEAD) + +[[ "${SOURCE_BRANCH:0:1}" =~ [0-9] ]] && VERSION=${SOURCE_BRANCH/-*/} + +[ "$SOURCE_BRANCH" = "master" ] && SOURCE_BRANCH="latest" + +# Set defaults for build arguments +[ -n "$SOURCE_TYPE" ] || SOURCE_TYPE=git +[ -n "$DOCKERFILE_PATH" ] || DOCKERFILE_PATH=. +[ -n "$IMAGE_NAME" ] || IMAGE_NAME=pdouble16/kafka-cruise-control:$SOURCE_BRANCH diff --git a/opt/cruise-control/config/log4j.properties b/opt/cruise-control/config/log4j.properties new file mode 100644 index 0000000..5e0d896 --- /dev/null +++ b/opt/cruise-control/config/log4j.properties @@ -0,0 +1,7 @@ +log4j.rootLogger = INFO, FILE + +log4j.appender.FILE=org.apache.log4j.FileAppender +log4j.appender.FILE.File=/dev/stdout + +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.conversionPattern=%-6r [%15.15t] %-5p %30.30c %x - %m%n diff --git a/opt/cruise-control/config/log4j2.xml b/opt/cruise-control/config/log4j2.xml new file mode 100644 index 0000000..d3f1304 --- /dev/null +++ b/opt/cruise-control/config/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/opt/cruise-control/start.sh b/opt/cruise-control/start.sh new file mode 100755 index 0000000..49934ed --- /dev/null +++ b/opt/cruise-control/start.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -e +cd /opt/cruise-control +/bin/bash ${DEBUG:+-x} /opt/cruise-control/kafka-cruise-control-start.sh /opt/cruise-control/config/cruisecontrol.properties 8090 From fd817f13dd7e45b0e9ca8c226466efcf91daaaa6 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 21 Dec 2018 19:10:54 +0100 Subject: [PATCH 3/8] Move to subfolder --- LICENSE | 201 ------------------ Dockerfile => cruise-control/Dockerfile | 0 {hooks => cruise-control/hooks}/build | 0 {hooks => cruise-control/hooks}/env | 0 .../cruise-control/config/log4j.properties | 0 .../opt}/cruise-control/config/log4j2.xml | 0 .../opt}/cruise-control/start.sh | 0 7 files changed, 201 deletions(-) delete mode 100644 LICENSE rename Dockerfile => cruise-control/Dockerfile (100%) rename {hooks => cruise-control/hooks}/build (100%) rename {hooks => cruise-control/hooks}/env (100%) rename {opt => cruise-control/opt}/cruise-control/config/log4j.properties (100%) rename {opt => cruise-control/opt}/cruise-control/config/log4j2.xml (100%) rename {opt => cruise-control/opt}/cruise-control/start.sh (100%) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/Dockerfile b/cruise-control/Dockerfile similarity index 100% rename from Dockerfile rename to cruise-control/Dockerfile diff --git a/hooks/build b/cruise-control/hooks/build similarity index 100% rename from hooks/build rename to cruise-control/hooks/build diff --git a/hooks/env b/cruise-control/hooks/env similarity index 100% rename from hooks/env rename to cruise-control/hooks/env diff --git a/opt/cruise-control/config/log4j.properties b/cruise-control/opt/cruise-control/config/log4j.properties similarity index 100% rename from opt/cruise-control/config/log4j.properties rename to cruise-control/opt/cruise-control/config/log4j.properties diff --git a/opt/cruise-control/config/log4j2.xml b/cruise-control/opt/cruise-control/config/log4j2.xml similarity index 100% rename from opt/cruise-control/config/log4j2.xml rename to cruise-control/opt/cruise-control/config/log4j2.xml diff --git a/opt/cruise-control/start.sh b/cruise-control/opt/cruise-control/start.sh similarity index 100% rename from opt/cruise-control/start.sh rename to cruise-control/opt/cruise-control/start.sh From 0c1ea37751c811c4879da8c96607eefd2f4fe5e7 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 21 Dec 2018 19:13:12 +0100 Subject: [PATCH 4/8] Build latet, 2.0.18 --- cruise-control/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cruise-control/Dockerfile b/cruise-control/Dockerfile index e4935af..9f066bc 100644 --- a/cruise-control/Dockerfile +++ b/cruise-control/Dockerfile @@ -1,5 +1,5 @@ FROM gradle:4.8-jdk8-slim -ARG VERSION=2.0.6 +ARG VERSION=2.0.18 USER root RUN apt-get update && apt-get install -y git RUN git clone -b ${VERSION} https://github.com/linkedin/cruise-control.git From 83f3f827a38eb360e14a2495b532971f07652a73 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 21 Dec 2018 19:13:29 +0100 Subject: [PATCH 5/8] Use Java 11, for resource limit support --- cruise-control/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cruise-control/Dockerfile b/cruise-control/Dockerfile index 9f066bc..310964f 100644 --- a/cruise-control/Dockerfile +++ b/cruise-control/Dockerfile @@ -6,7 +6,7 @@ RUN git clone -b ${VERSION} https://github.com/linkedin/cruise-control.git RUN cd cruise-control && gradle jar copyDependantLibs # The container is made to work with github.com/Yolean/kubernetes-kafka, so we try to use a common base -FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 +FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9 ARG SOURCE_REF ARG SOURCE_TYPE ARG DOCKERFILE_PATH From ee8c6f6480374148cae4be6e0e082268493c3371 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 21 Dec 2018 19:19:51 +0100 Subject: [PATCH 6/8] The original readme from double16 --- cruise-control/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 cruise-control/README.md diff --git a/cruise-control/README.md b/cruise-control/README.md new file mode 100644 index 0000000..954c7f2 --- /dev/null +++ b/cruise-control/README.md @@ -0,0 +1,5 @@ +kafka-cruise-control +==================== + +LinkedIn Cruise Control manager for Kafka. This image includes the Cruise Control application. It does not include Kafka or the metrics reporter. + From ee0d1bf163c9ec9253cc770985d72038c02dde53 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 21 Dec 2018 19:22:31 +0100 Subject: [PATCH 7/8] Build using JDK 11 --- cruise-control/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cruise-control/Dockerfile b/cruise-control/Dockerfile index 310964f..3e18881 100644 --- a/cruise-control/Dockerfile +++ b/cruise-control/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:4.8-jdk8-slim +FROM gradle:jdk11-slim ARG VERSION=2.0.18 USER root RUN apt-get update && apt-get install -y git From b3493cb284925c2412698ac285ed0a549313af36 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Fri, 21 Dec 2018 22:29:41 +0100 Subject: [PATCH 8/8] Revert "Build using JDK 11" This reverts commit ee0d1bf163c9ec9253cc770985d72038c02dde53. --- cruise-control/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cruise-control/Dockerfile b/cruise-control/Dockerfile index 3e18881..310964f 100644 --- a/cruise-control/Dockerfile +++ b/cruise-control/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:jdk11-slim +FROM gradle:4.8-jdk8-slim ARG VERSION=2.0.18 USER root RUN apt-get update && apt-get install -y git