Skip to content

Commit

Permalink
Merge pull request #6 from GeographicaGS/ManuelLR-patch-1
Browse files Browse the repository at this point in the history
Update Dockerfile
  • Loading branch information
ManuelLR authored Jun 4, 2019
2 parents ebc4242 + 970abf4 commit 1a59610
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ steps:
registry: eu.gcr.io
json_key:
from_secret: google_credentials
build_args:
- ENVIRONMENT=test
cache_from:
- eu.gcr.io/habichuelas/cicd/geolibs/glutemulo:${DRONE_COMMIT_BRANCH//\//__}
- eu.gcr.io/habichuelas/cicd/geolibs/glutemulo:master
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN set -ex ; \
apt-get install -y --no-install-recommends \
$BUILD_DEPS ; \
pip install "poetry==$POETRY_VERSION" ; \
# poetry config settings.virtualenvs.create false ; \
poetry config settings.virtualenvs.create false ; \
poetry completions bash > /etc/bash_completion.d/poetry.bash-completion ; \
poetry install --no-interaction --no-ansi $POETRY_EXTRA ; \
apt-get remove -y --purge $BUILD_DEPS ; \
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Geographica

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
11 changes: 11 additions & 0 deletions deploy/k8s/kafka/rbac-admin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-admins
subjects:
- kind: User
name: <username>@geographica.com
roleRef:
kind: ClusterRole
name: cluster-admin
apiGroup: ""
4 changes: 4 additions & 0 deletions deploy/k8s/kafka/scale-1/kafka-topics-override.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
{"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "--override"},
{"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "auto.create.topics.enable=true"}
]
9 changes: 9 additions & 0 deletions deploy/k8s/kafka/scale-1/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@ bases:
# https://github.com/kubernetes-sigs/kustomize/blob/master/docs/kustomization.yaml
- github.com/Yolean/kubernetes-kafka/variants/scale-1?ref=v6.0.1

# If you found rbac permissions problems use this: ../../rbac-admin.yaml

patchesJson6902:
- target:
group: apps
version: v1
kind: StatefulSet
name: kafka
path: kafka-topics-override.json
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
ports:
- "9092:9092"
environment:
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092
KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP:-172.17.0.1}:9092
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
Expand Down

0 comments on commit 1a59610

Please sign in to comment.