From 0a02163351767bc9947b3a5cc197520b0b3f0fb8 Mon Sep 17 00:00:00 2001 From: Vishnu Bharathi Date: Mon, 13 Jan 2025 20:03:32 +0530 Subject: [PATCH] ci: remove generating ddn-assets (#431) ddn-assets service will be used to store not just connector-related assets, but other type of assets too. So we will avoid building an image for it here and instead build it as part of https://github.com/hasura/ddn-assets repo. --- .github/workflows/ddn-assets.yaml | 57 ------------------------------- docker/data/Dockerfile | 3 -- docker/server/Caddyfile | 3 -- docker/server/Dockerfile | 11 ------ 4 files changed, 74 deletions(-) delete mode 100644 .github/workflows/ddn-assets.yaml delete mode 100644 docker/data/Dockerfile delete mode 100644 docker/server/Caddyfile delete mode 100644 docker/server/Dockerfile diff --git a/.github/workflows/ddn-assets.yaml b/.github/workflows/ddn-assets.yaml deleted file mode 100644 index 30d0220b..00000000 --- a/.github/workflows/ddn-assets.yaml +++ /dev/null @@ -1,57 +0,0 @@ -name: DDN Assets - -on: - push: - branches: - - "main" - -env: - DATA_TAG: data.${{ github.sha }} - DATA_SERVER_TAG: data-server.${{ github.sha }} - DDN_ASSETS_VERSION: v0.2.1 - -jobs: - generate: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - attestations: write - id-token: write - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push data image - run: | - export NDC_HUB_GIT_REPO_FILE_PATH=$PWD - echo "NDC_HUB_GIT_REPO_FILE_PATH = $NDC_HUB_GIT_REPO_FILE_PATH" - export CONN_HUB_DATA_SERVER_URL="https://storage.googleapis.com/staging-connector-platform-registry/assets" - echo "CONN_HUB_DATA_SERVER_URL = $CONN_HUB_DATA_SERVER_URL" - - pushd docker/data - echo "Downloading ddn-assets" - wget https://github.com/hasura/ddn-assets/releases/download/$DDN_ASSETS_VERSION/ddn-assets - chmod +x ddn-assets - - # TODO: get rid of this after fixing https://github.com/hasura/ddn-assets/issues/7 - mkdir assets - - echo "Running ddn-assets" - ./ddn-assets generate - - docker build -t ghcr.io/hasura/ndc-hub:$DATA_TAG . --push - popd - - - name: Build and push data server image - run: | - pushd docker/server - docker build --build-arg DATA_TAG=$DATA_TAG -t ghcr.io/hasura/ndc-hub:$DATA_SERVER_TAG . --push - popd diff --git a/docker/data/Dockerfile b/docker/data/Dockerfile deleted file mode 100644 index 78ffe6ea..00000000 --- a/docker/data/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM scratch - -COPY assets/outputs /assets \ No newline at end of file diff --git a/docker/server/Caddyfile b/docker/server/Caddyfile deleted file mode 100644 index c17ddb16..00000000 --- a/docker/server/Caddyfile +++ /dev/null @@ -1,3 +0,0 @@ -localhost - -file_server \ No newline at end of file diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile deleted file mode 100644 index 58aee4e7..00000000 --- a/docker/server/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG DATA_TAG - -FROM ghcr.io/hasura/ndc-hub:$DATA_TAG as data - -FROM caddy:alpine - -COPY --from=data /assets /srv - -EXPOSE 80 - -CMD ["caddy", "file-server", "--browse", "--root", "/srv"] \ No newline at end of file