Skip to content

Commit

Permalink
Update to latest DataDog Java Agent (#5502)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdpgrailsdev committed Mar 29, 2023
1 parent d6311d4 commit 4a2303b
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions airbyte-base-java-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ To release a new version of this base image, use the following steps:
To see existing versions, [view the image on Dockerhub](https://hub.docker.com/r/airbyte/airbyte-base-java-image).
4. Update base Docker image tag to the new version in all Dockerfiles that depend on the base image:
```bash
FROM airbyte/java-datadog-tracer-base:<NEW VERSION>
FROM airbyte/airbyte-base-java-image:<NEW VERSION>
```

[dockerhub]: https://hub.docker.com/repository/registry-1.docker.io/airbyte/airbyte-base-java-image/general
[dockerhub]: https://hub.docker.com/repository/docker/airbyte/airbyte-base-java-image/general
2 changes: 1 addition & 1 deletion airbyte-bootloader/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE}

ARG VERSION=0.42.0
Expand Down
2 changes: 1 addition & 1 deletion airbyte-connector-atelier-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:1.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE} AS connector-atelier-server

RUN yum update -y && \
Expand Down
2 changes: 1 addition & 1 deletion airbyte-container-orchestrator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE} AS orchestrator

ARG DOCKER_BUILD_ARCH=amd64
Expand Down
2 changes: 1 addition & 1 deletion airbyte-cron/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE} AS cron

ARG VERSION=0.42.0
Expand Down
2 changes: 1 addition & 1 deletion airbyte-metrics/reporter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE} AS metrics-reporter

ARG VERSION=0.42.0
Expand Down
2 changes: 1 addition & 1 deletion airbyte-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE} AS server

EXPOSE 8000
Expand Down
2 changes: 1 addition & 1 deletion airbyte-workers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:2.0.1
FROM ${JDK_IMAGE} AS worker

ARG DOCKER_BUILD_ARCH=amd64
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ subprojects { subproj ->
def nginxImage = System.getenv('NGINX_IMAGE') ?: isArm64 ? 'arm64v8/nginx:alpine' : 'amd64/nginx:alpine'

// Used by the platform -- Must be an Amazon Corretto-based image for build to work without modification to Dockerfile instructions
def openjdkImage = System.getenv('JDK_IMAGE') ?: 'airbyte/airbyte-base-java-image:2.0'
def openjdkImage = System.getenv('JDK_IMAGE') ?: 'airbyte/airbyte-base-java-image:2.0.1'

platform = buildPlatform
images.add("airbyte/$subproj.dockerImageName:$rootProject.ext.image_tag")
Expand Down
2 changes: 1 addition & 1 deletion deps.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
airbyte-protocol = "1.0.0"
commons_io = "2.7"
connectors-testcontainers = "1.15.3"
datadog-version = "1.10.0"
datadog-version = "1.11.0"
docker-java = "3.2.8"
fasterxml_version = "2.14.2"
flyway = "7.14.0"
Expand Down

0 comments on commit 4a2303b

Please sign in to comment.