From 28e80204895569615d6c7fd2743486da1a3920e7 Mon Sep 17 00:00:00 2001 From: AtulRajput01 Date: Tue, 20 Jun 2023 11:03:07 +0530 Subject: [PATCH] Added Extention Tracker Support for AWS S3 --- .github/workflows/smoke-test.yml | 17 +++++++++++++++++ Dockerfile | 10 ++++++++++ bitnami/Dockerfile | 10 ++++++++++ docker-compose.yml | 13 +++++++++++++ 4 files changed, 50 insertions(+) diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 6ca64f0d..0e26fdea 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -36,7 +36,24 @@ jobs: - name: Install psql run: sudo apt install postgresql-client + + - name: AWS S3 Extension Tracker + run: | + docker run --rm -d \ + --name ext-tracker \ + -v /path/to/ext-tracker-data:/data \ + -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \ + -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \ + -e AWS_DEFAULT_REGION=Global \ + minio/mc \ + mb s3://my-bucket + - name: Run Smoke Test with Extension Tracker + run: | + docker exec ext-tracker mc mb s3://my-bucket + docker exec ext-tracker mc cp ./local-file.txt s3://my-bucket/path/to/remote-file.txt + docker exec ext-tracker mc ls s3://my-bucket + - name: Run the smoke test run: | set -eu diff --git a/Dockerfile b/Dockerfile index f8f694a5..e32df947 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,16 @@ COPY --from=tools /go/bin/* /usr/local/bin/ COPY --from=oldversions /usr/local/lib/postgresql/timescaledb-*.so /usr/local/lib/postgresql/ COPY --from=oldversions /usr/local/share/postgresql/extension/timescaledb--*.sql /usr/local/share/postgresql/extension/ +# Add master extension tracker for support AWS S3 +FROM minio/mc + +VOLUME /data +CMD mc mb my-bucket + +ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} +ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} +ENV AWS_DEFAULT_REGION=Global + ARG TS_VERSION RUN set -ex \ && apk add libssl1.1 \ diff --git a/bitnami/Dockerfile b/bitnami/Dockerfile index f1c1aacf..15f5885f 100644 --- a/bitnami/Dockerfile +++ b/bitnami/Dockerfile @@ -61,6 +61,16 @@ COPY --from=oldversions /opt/bitnami/postgresql/lib/.emptyfile /opt/bitnami/post COPY --from=oldversions /opt/bitnami/postgresql/share/extension/.emptyfile /opt/bitnami/postgresql/share/extension/timescaledb--*.sql /opt/bitnami/postgresql/share/extension/ COPY bitnami/timescaledb-bitnami-entrypoint.sh /opt/bitnami/scripts/postgresql/ +#Add the extension tracker Dockerfile for AWS S3 +FROM minio/mc + +VOLUME /data +CMD mc mb my-bucket + +ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} +ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} +ENV AWS_DEFAULT_REGION=Global + USER 0 ARG TS_VERSION RUN set -ex \ diff --git a/docker-compose.yml b/docker-compose.yml index f11ce7cd..38698055 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,3 +43,16 @@ services: depends_on: - "timescaledb" restart: always + + extension-tracker: + image: minio/mc + volumes: + - ./data:/data + command: mc mb my-bucket + depends_on: + - "timescaledb" + restart: always + environment: + - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} + - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} + - AWS_DEFAULT_REGION=Global