Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
command: ["/bin/bash", "-c" ,"./mae-consumer-job/bin/mae-consumer-job"]
command: ["/bin/sh", "-c" ,"./mae-consumer-job/bin/mae-consumer-job"]
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: KAFKA_BOOTSTRAP_SERVER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: ["/bin/bash", "-c" ,"./mce-consumer-job/bin/mce-consumer-job"]
command: ["/bin/sh", "-c" ,"./mce-consumer-job/bin/mce-consumer-job"]
env:
- name: KAFKA_BOOTSTRAP_SERVER
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
containers:
- name: datahub-mae-consumer
image: keremsahin/datahub-mae-consumer:latest
command: ["/bin/bash", "-c" ,"./mae-consumer-job/bin/mae-consumer-job"]
command: ["/bin/sh", "-c" ,"./mae-consumer-job/bin/mae-consumer-job"]
env:
- name: KAFKA_BOOTSTRAP_SERVER
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
containers:
- name: datahub-mce-consumer
image: keremsahin/datahub-mce-consumer:latest
command: ["/bin/bash", "-c" ,"./mce-consumer-job/bin/mce-consumer-job"]
command: ["/bin/sh", "-c" ,"./mce-consumer-job/bin/mce-consumer-job"]
env:
- name: KAFKA_BOOTSTRAP_SERVER
valueFrom:
Expand Down
8 changes: 6 additions & 2 deletions docker/mae-consumer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
FROM openjdk:8
FROM openjdk:8 as builder

MAINTAINER Kerem Sahin [email protected]

COPY . datahub-src
RUN cd datahub-src && ./gradlew :metadata-jobs:mae-consumer-job:build \
&& cp metadata-jobs/mae-consumer-job/build/distributions/mae-consumer-job.zip ../mae-consumer-job.zip \
&& cd .. && rm -rf datahub-src && unzip mae-consumer-job.zip
&& cd .. && rm -rf datahub-src && unzip mae-consumer-job.zip

FROM openjdk:8-jre-alpine

COPY --from=builder /mae-consumer-job /mae-consumer-job/
2 changes: 1 addition & 1 deletion docker/mae-consumer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- NEO4J_URI=bolt://neo4j
- NEO4J_USERNAME=neo4j
- NEO4J_PASSWORD=datahub
command: "bash -c './mae-consumer-job/bin/mae-consumer-job'"
command: "sh -c './mae-consumer-job/bin/mae-consumer-job'"

networks:
default:
Expand Down
8 changes: 6 additions & 2 deletions docker/mce-consumer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
FROM openjdk:8
FROM openjdk:8 as builder

MAINTAINER Kerem Sahin [email protected]

COPY . datahub-src
RUN cd datahub-src && ./gradlew :metadata-jobs:mce-consumer-job:build \
&& cp metadata-jobs/mce-consumer-job/build/distributions/mce-consumer-job.zip ../mce-consumer-job.zip \
&& cd .. && rm -rf datahub-src && unzip mce-consumer-job.zip
&& cd .. && rm -rf datahub-src && unzip mce-consumer-job.zip

FROM openjdk:8-jre-alpine

COPY --from=builder /mce-consumer-job /mce-consumer-job/
2 changes: 1 addition & 1 deletion docker/mce-consumer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
- GMS_HOST=datahub-gms
- GMS_PORT=8080
command: "bash -c './mce-consumer-job/bin/mce-consumer-job'"
command: "sh -c './mce-consumer-job/bin/mce-consumer-job'"

networks:
default:
Expand Down
4 changes: 2 additions & 2 deletions docker/quickstart/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ services:
- kafka-setup
- elasticsearch
- neo4j
command: "bash -c 'while ping -c1 kafka-setup &>/dev/null; do echo waiting for kafka-setup... && sleep 1; done; \
command: "sh -c 'while ping -c1 kafka-setup &>/dev/null; do echo waiting for kafka-setup... && sleep 1; done; \
echo kafka-setup done! && ./mae-consumer-job/bin/mae-consumer-job'"

datahub-mce-consumer:
Expand All @@ -249,7 +249,7 @@ services:
depends_on:
- kafka-setup
- datahub-gms
command: "bash -c 'while ping -c1 kafka-setup &>/dev/null; do echo waiting for kafka-setup... && sleep 1; done; \
command: "sh -c 'while ping -c1 kafka-setup &>/dev/null; do echo waiting for kafka-setup... && sleep 1; done; \
echo kafka-setup done! && ./mce-consumer-job/bin/mce-consumer-job'"

networks:
Expand Down