diff --git a/.pipeline/mae-consumer/blubber.yaml b/.pipeline/mae-consumer/blubber.yaml index 3fcdb067f..8e71c3b97 100644 --- a/.pipeline/mae-consumer/blubber.yaml +++ b/.pipeline/mae-consumer/blubber.yaml @@ -1,84 +1,84 @@ # syntax=docker-registry.wikimedia.org/repos/releng/blubber:v0.17.0 version: v4 base: docker-registry.wikimedia.org/openjdk-11-jdk lives: in: /datahub/datahub-mae-consumer variants: datahub-source: lives: in: /datahub base: docker-registry.wikimedia.org/bullseye:latest apt: packages: [ 'git', 'ca-certificates' ] builders: - custom: command: - git - clone - '--branch' - 'v0.10.4' - '--single-branch' - "https://github.com/datahub-project/datahub.git" - "/datahub" - custom: command: - chmod - +x - /datahub/docker/datahub-mae-consumer/start.sh dockerize: base: docker-registry.wikimedia.org/golang1.19:1.19-1-20230625 builder: command: [ 'go', 'install', 'github.com/jwilder/dockerize@v0.6.1'] build: lives: in: /datahub builder: command: ['./gradlew', ':metadata-jobs:mae-consumer-job:build'] requirements: - from: datahub-source source: /datahub destination: /datahub prepare: apt: { packages: [wget] } builders: - custom: command: [ 'wget', '--no-verbose' ,'https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.24.0/opentelemetry-javaagent.jar', '-O', '/tmp/opentelemetry-javaagent.jar'] - custom: command: [ 'wget', '--no-verbose' ,'https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.18.0/jmx_prometheus_javaagent-0.18.0.jar', '-O', '/tmp/jmx_prometheus_javaagent.jar'] production: apt: sources: - url: http://apt.wikimedia.org/wikimedia distribution: bullseye-wikimedia components: [main] packages: [ wmf-certificates ] copies: - from: build source: /datahub/metadata-jobs/mae-consumer-job/build/libs/mae-consumer-job.jar destination: /datahub/datahub-mae-consumer/bin/mae-consumer-job.jar - from: datahub-source source: /datahub/metadata-models/src/main/resources/entity-registry.yml destination: /datahub/datahub-mae-consumer/resources/entity-registry.yml - from: datahub-source source: /datahub/docker/datahub-mae-consumer/start.sh destination: /datahub/datahub-mae-consumer/scripts/start.sh - from: datahub-source source: /datahub/docker/monitoring/client-prometheus-config.yaml destination: /datahub/datahub-mae-consumer/scripts/prometheus-config.yaml - from: dockerize source: /go/bin/dockerize destination: /usr/local/bin - from: prepare source: /tmp/opentelemetry-javaagent.jar destination: / - from: prepare source: /tmp/jmx_prometheus_javaagent.jar destination: / - entrypoint: ['/datahub/datahub-mae-consumer/scripts/start.sh'] + entrypoint: ['/bin/sh', '-c', 'cd / && /datahub/datahub-mae-consumer/scripts/start.sh'] diff --git a/.pipeline/mce-consumer/blubber.yaml b/.pipeline/mce-consumer/blubber.yaml index d71330f11..c0422be33 100644 --- a/.pipeline/mce-consumer/blubber.yaml +++ b/.pipeline/mce-consumer/blubber.yaml @@ -1,83 +1,83 @@ # syntax=docker-registry.wikimedia.org/repos/releng/blubber:v0.17.0 version: v4 base: docker-registry.wikimedia.org/openjdk-11-jdk lives: in: /datahub/datahub-mce-consumer variants: datahub-source: lives: in: /datahub base: docker-registry.wikimedia.org/bullseye:latest apt: packages: [ 'git', 'ca-certificates' ] builders: - custom: command: - git - clone - '--branch' - 'v0.10.4' - '--single-branch' - "https://github.com/datahub-project/datahub.git" - "/datahub" - custom: command: - chmod - +x - /datahub/docker/datahub-mce-consumer/start.sh dockerize: base: docker-registry.wikimedia.org/golang1.19:1.19-1-20230625 builder: command: [ 'go', 'install', 'github.com/jwilder/dockerize@v0.6.1'] build: lives: in: /datahub builder: command: ['./gradlew', ':metadata-jobs:mce-consumer-job:build'] requirements: - from: datahub-source source: /datahub destination: /datahub prepare: apt: { packages: [wget] } builders: - custom: command: [ 'wget', '--no-verbose' ,'https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.24.0/opentelemetry-javaagent.jar', '-O', '/tmp/opentelemetry-javaagent.jar'] - custom: command: [ 'wget', '--no-verbose' ,'https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.18.0/jmx_prometheus_javaagent-0.18.0.jar', '-O', '/tmp/jmx_prometheus_javaagent.jar'] production: apt: sources: - url: http://apt.wikimedia.org/wikimedia distribution: bullseye-wikimedia components: [main] packages: [ wmf-certificates ] copies: - from: build source: /datahub/metadata-jobs/mce-consumer-job/build/libs/mce-consumer-job.jar destination: /datahub/datahub-mce-consumer/bin/mce-consumer-job.jar - from: datahub-source source: /datahub/metadata-models/src/main/resources/entity-registry.yml destination: /datahub/datahub-mce-consumer/resources/entity-registry.yml - from: datahub-source source: /datahub/docker/datahub-mce-consumer/start.sh destination: /datahub/datahub-mce-consumer/scripts/start.sh - from: datahub-source source: /datahub/docker/monitoring/client-prometheus-config.yaml destination: /datahub/datahub-mce-consumer/scripts/prometheus-config.yaml - from: dockerize source: /go/bin/dockerize destination: /usr/local/bin - from: prepare source: /tmp/opentelemetry-javaagent.jar destination: / - from: prepare source: /tmp/jmx_prometheus_javaagent.jar destination: / - entrypoint: ['/datahub/datahub-mce-consumer/scripts/start.sh'] + entrypoint: ['/bin/sh', '-c', 'cd / && /datahub/datahub-mce-consumer/scripts/start.sh']