From 10ce110612059ff0928071bf1478ef7b5454b741 Mon Sep 17 00:00:00 2001 From: alafanechere Date: Fri, 6 Dec 2024 18:43:19 +0100 Subject: [PATCH 1/5] Revert "chore: revert SDM image change (#145)" This reverts commit 59505ffdb235c8344a7a82d222700b17028119a8. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b0f34a19..2f87497e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/airbyte/python-connector-base:2.0.0@sha256:c44839ba84406116e8ba68722a0f30e8f6e7056c726f447681bb9e9ece8bd916 +FROM docker.io/airbyte/python-connector-base:3.0.0@sha256:1a0845ff2b30eafa793c6eee4e8f4283c2e52e1bbd44eed6cb9e9abd5d34d844 WORKDIR /airbyte/integration_code @@ -26,3 +26,4 @@ RUN rm -rf dist/ pyproject.toml poetry.lock README.md # Set the entrypoint ENV AIRBYTE_ENTRYPOINT="python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] +USER airbyte From 48bfb51aef2a3163039d79e7fdd60677345d369f Mon Sep 17 00:00:00 2001 From: alafanechere Date: Fri, 6 Dec 2024 18:45:15 +0100 Subject: [PATCH 2/5] chore: make SDM rootless --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2f87497e6..332c5f663 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,9 @@ RUN mkdir -p source_declarative_manifest \ # Remove unnecessary build files RUN rm -rf dist/ pyproject.toml poetry.lock README.md +# Set ownership of /airbyte to the airbyte user +RUN chown -R airbyte /airbyte + # Set the entrypoint ENV AIRBYTE_ENTRYPOINT="python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] From 9865f5844e4b9be017e3d6eb55de19cc9dacf35d Mon Sep 17 00:00:00 2001 From: "Aaron (\"AJ\") Steers" Date: Fri, 6 Dec 2024 10:41:14 -0800 Subject: [PATCH 3/5] apply suggestion --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 332c5f663..e296b5315 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p source_declarative_manifest \ # Remove unnecessary build files RUN rm -rf dist/ pyproject.toml poetry.lock README.md -# Set ownership of /airbyte to the airbyte user +# Set ownership of /airbyte to the (non-root) airbyte user RUN chown -R airbyte /airbyte # Set the entrypoint From ac032348fe62a407ce0aedc96a5dcb9a0896f7ab Mon Sep 17 00:00:00 2001 From: alafanechere Date: Mon, 9 Dec 2024 10:03:53 +0100 Subject: [PATCH 4/5] fix chown --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 332c5f663..b12f142e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,8 @@ RUN mkdir -p source_declarative_manifest \ # Remove unnecessary build files RUN rm -rf dist/ pyproject.toml poetry.lock README.md -# Set ownership of /airbyte to the airbyte user -RUN chown -R airbyte /airbyte +# Set ownership of /airbyte to the airbyte user and group (1000:1000) +RUN chown -R 1000:1000 /airbyte # Set the entrypoint ENV AIRBYTE_ENTRYPOINT="python /airbyte/integration_code/main.py" From 0b967632faac521874dc56790b0bd65d01202f42 Mon Sep 17 00:00:00 2001 From: alafanechere Date: Mon, 9 Dec 2024 10:08:09 +0100 Subject: [PATCH 5/5] fix chown --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b12f142e6..400fe4d48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p source_declarative_manifest \ # Remove unnecessary build files RUN rm -rf dist/ pyproject.toml poetry.lock README.md -# Set ownership of /airbyte to the airbyte user and group (1000:1000) +# Set ownership of /airbyte to the non-root airbyte user and group (1000:1000) RUN chown -R 1000:1000 /airbyte # Set the entrypoint