diff --git a/airbyte-integrations/connectors/source-faker/Dockerfile b/airbyte-integrations/connectors/source-faker/Dockerfile deleted file mode 100644 index d0648a0212e1..000000000000 --- a/airbyte-integrations/connectors/source-faker/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM python:3.9.11-alpine3.15 as base - -# build and load all requirements -FROM base as builder -WORKDIR /airbyte/integration_code - -# upgrade pip to the latest version -RUN apk --no-cache upgrade \ - && pip install --upgrade pip \ - && apk --no-cache add tzdata build-base - - -COPY setup.py ./ -# install necessary packages to a temporary folder -RUN pip install --prefix=/install . - -# build a clean environment -FROM base -WORKDIR /airbyte/integration_code - -# copy all loaded and built libraries to a pure basic image -COPY --from=builder /install /usr/local -# add default timezone settings -COPY --from=builder /usr/share/zoneinfo/Etc/UTC /etc/localtime -RUN echo "Etc/UTC" > /etc/timezone - -# bash is installed for more convenient debugging. -RUN apk --no-cache add bash - -# copy payload code only -COPY main.py ./ -COPY source_faker ./source_faker - -ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" -ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] - -LABEL io.airbyte.version=5.0.0 -LABEL io.airbyte.name=airbyte/source-faker diff --git a/airbyte-integrations/connectors/source-faker/metadata.yaml b/airbyte-integrations/connectors/source-faker/metadata.yaml index 83aa3520b711..e338e43583c4 100644 --- a/airbyte-integrations/connectors/source-faker/metadata.yaml +++ b/airbyte-integrations/connectors/source-faker/metadata.yaml @@ -7,7 +7,7 @@ data: connectorSubtype: api connectorType: source definitionId: dfd88b22-b603-4c3d-aad7-3701784586b1 - dockerImageTag: 5.0.0 + dockerImageTag: 5.1.0 dockerRepository: airbyte/source-faker documentationUrl: https://docs.airbyte.com/integrations/sources/faker githubIssueLabel: source-faker @@ -44,4 +44,6 @@ data: supportLevel: community tags: - language:python + connectorBuildOptions: + baseImage: "airbyte-python-connector-base:1.0.0" metadataSpecVersion: "1.0" diff --git a/airbyte-integrations/connectors/source-file-secure/Dockerfile b/airbyte-integrations/connectors/source-file-secure/Dockerfile deleted file mode 100644 index fa3b8daf6d7e..000000000000 --- a/airbyte-integrations/connectors/source-file-secure/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -### WARNING ### -# This Dockerfile will soon be deprecated. -# It is not used to build the connector image we publish to DockerHub. -# The new logic to build the connector image is declared with Dagger here: -# https://github.com/airbytehq/airbyte/blob/master/tools/ci_connector_ops/ci_connector_ops/pipelines/actions/environments.py#L771 - -# If you need to add a custom logic to build your connector image, you can do it by adding a finalize_build.sh or finalize_build.py script in the connector folder. -# Please reach out to the Connectors Operations team if you have any question. -FROM airbyte/source-file:0.3.11 - -WORKDIR /airbyte/integration_code -COPY source_file_secure ./source_file_secure -COPY main.py ./ -COPY setup.py ./ -ENV DOCKER_BUILD=True -RUN pip install . - -ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" -ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] - -LABEL io.airbyte.version=0.3.11 -LABEL io.airbyte.name=airbyte/source-file-secure diff --git a/airbyte-integrations/connectors/source-file-secure/metadata.yaml b/airbyte-integrations/connectors/source-file-secure/metadata.yaml index 9bccb5d2ef88..f8b095f0c66c 100644 --- a/airbyte-integrations/connectors/source-file-secure/metadata.yaml +++ b/airbyte-integrations/connectors/source-file-secure/metadata.yaml @@ -5,7 +5,7 @@ data: connectorSubtype: file connectorType: source definitionId: 778daa7c-feaf-4db6-96f3-70fd645acc77 - dockerImageTag: 0.3.11 + dockerImageTag: 0.4.0 dockerRepository: airbyte/source-file-secure githubIssueLabel: source-file icon: file.svg @@ -20,4 +20,6 @@ data: documentationUrl: https://docs.airbyte.com/integrations/sources/file tags: - language:python + connectorBuildOptions: + baseImage: "airbyte-python-connector-base:1.0.0" metadataSpecVersion: "1.0" diff --git a/airbyte-integrations/connectors/source-file/Dockerfile b/airbyte-integrations/connectors/source-file/Dockerfile deleted file mode 100644 index 5755c3e6505d..000000000000 --- a/airbyte-integrations/connectors/source-file/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM python:3.9-slim as base -FROM base as builder - -RUN apt-get update -WORKDIR /airbyte/integration_code -COPY setup.py ./ -RUN pip install --prefix=/install . - -FROM base -WORKDIR /airbyte/integration_code -COPY --from=builder /install /usr/local - -COPY main.py ./ -COPY source_file ./source_file - - -ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" -ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] - -LABEL io.airbyte.version=0.3.11 -LABEL io.airbyte.name=airbyte/source-file diff --git a/airbyte-integrations/connectors/source-file/metadata.yaml b/airbyte-integrations/connectors/source-file/metadata.yaml index a6a868e7b8c3..6762d10271bf 100644 --- a/airbyte-integrations/connectors/source-file/metadata.yaml +++ b/airbyte-integrations/connectors/source-file/metadata.yaml @@ -5,7 +5,7 @@ data: connectorSubtype: file connectorType: source definitionId: 778daa7c-feaf-4db6-96f3-70fd645acc77 - dockerImageTag: 0.3.11 + dockerImageTag: 0.4.0 dockerRepository: airbyte/source-file githubIssueLabel: source-file icon: file.svg @@ -14,7 +14,7 @@ data: registries: cloud: dockerRepository: airbyte/source-file-secure - dockerImageTag: 0.3.11 # Dont forget to publish source-file-secure as well when updating this. + dockerImageTag: 0.4.0 # Dont forget to publish source-file-secure as well when updating this. enabled: true oss: enabled: true @@ -26,4 +26,6 @@ data: sl: 200 ql: 400 supportLevel: certified + connectorBuildOptions: + baseImage: "airbyte-python-connector-base:1.0.0" metadataSpecVersion: "1.0" diff --git a/docs/integrations/sources/faker.md b/docs/integrations/sources/faker.md index 8e2feb4f99b1..9476af2a1542 100644 --- a/docs/integrations/sources/faker.md +++ b/docs/integrations/sources/faker.md @@ -96,6 +96,7 @@ None! | Version | Date | Pull Request | Subject | |:--------|:-----------|:----------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------| +| 5.1.0 | 2023-09-15 | [30468](https://github.com/airbytehq/airbyte/pull/30468) | Build from our base image: airbyte-python-connector-base:1.0.0 | | 5.0.0 | 2023-08-08 | [29213](https://github.com/airbytehq/airbyte/pull/29213) | Change all `*id` fields and `products.year` to be integer | | 4.0.0 | 2023-07-19 | [28485](https://github.com/airbytehq/airbyte/pull/28485) | Bump to test publication | | 3.0.2 | 2023-07-07 | [27807](https://github.com/airbytehq/airbyte/pull/28060) | Bump to test publication | diff --git a/docs/integrations/sources/file.md b/docs/integrations/sources/file.md index 99ee0add09bd..9702dd2c2baa 100644 --- a/docs/integrations/sources/file.md +++ b/docs/integrations/sources/file.md @@ -216,6 +216,7 @@ In order to read large files from a remote location, this connector uses the [sm | Version | Date | Pull Request | Subject | |:--------|:-----------|:-----------------------------------------------------------|:--------------------------------------------------------------------------------------------------------| +| 0.4.0 | 2023-09-15 | [30468](https://github.com/airbytehq/airbyte/pull/30468) | Build from our base image: airbyte-python-connector-base:1.0.0 | 0.3.11 | 2023-06-08 | [27157](https://github.com/airbytehq/airbyte/pull/27157) | Force smart open log level to ERROR | | 0.3.10 | 2023-06-07 | [27107](https://github.com/airbytehq/airbyte/pull/27107) | Make source-file testable in our new airbyte-ci pipelines | | 0.3.9 | 2023-05-18 | [26275](https://github.com/airbytehq/airbyte/pull/26275) | Add ParserError handling |