From aa81b95e7c4bf7abc83e28b341ae6e8fdfdf7317 Mon Sep 17 00:00:00 2001 From: Josh Lind Date: Tue, 8 Aug 2023 19:21:28 -0400 Subject: [PATCH] Revert "[NFT Metadata Crawler] Dockerize Parser (#9541)" This reverts commit 0cea9e40990ff82a41e664d16135427bcc86746d. --- .dockerignore | 1 - docker/builder/build-tools.sh | 2 -- docker/builder/docker-bake-rust-all.hcl | 10 --------- .../builder/nft-metadata-crawler.Dockerfile | 22 ------------------- 4 files changed, 35 deletions(-) delete mode 100644 docker/builder/nft-metadata-crawler.Dockerfile diff --git a/.dockerignore b/.dockerignore index e3f1919d5c3d8..f2da8e28e015f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -27,7 +27,6 @@ !api/doc/ !crates/indexer/migrations/**/*.sql !ecosystem/indexer-grpc/indexer-grpc-parser/migrations/**/*.sql -!ecosystem/nft-metadata-crawler-parser/migrations/**/*.sql !terraform/helm/aptos-node/ !terraform/helm/genesis/ !testsuite/forge/src/backend/k8s/ diff --git a/docker/builder/build-tools.sh b/docker/builder/build-tools.sh index 908380b46b4b3..7c55469f110d7 100755 --- a/docker/builder/build-tools.sh +++ b/docker/builder/build-tools.sh @@ -26,7 +26,6 @@ cargo build --locked --profile=$PROFILE \ -p aptos-indexer-grpc-file-store \ -p aptos-indexer-grpc-data-service \ -p aptos-indexer-grpc-post-processor \ - -p aptos-nft-metadata-crawler-parser \ "$@" # After building, copy the binaries we need to `dist` since the `target` directory is used as docker cache mount and only available during the RUN step @@ -45,7 +44,6 @@ BINS=( aptos-indexer-grpc-file-store aptos-indexer-grpc-data-service aptos-indexer-grpc-post-processor - aptos-nft-metadata-crawler-parser ) mkdir dist diff --git a/docker/builder/docker-bake-rust-all.hcl b/docker/builder/docker-bake-rust-all.hcl index 465d13b242059..1b6194266c074 100644 --- a/docker/builder/docker-bake-rust-all.hcl +++ b/docker/builder/docker-bake-rust-all.hcl @@ -58,7 +58,6 @@ group "all" { "telemetry-service", "indexer-grpc", "validator-testing", - "nft-metadata-crawler", ]) } @@ -214,15 +213,6 @@ target "indexer-grpc" { tags = generate_tags("indexer-grpc") } -target "nft-metadata-crawler" { - inherits = ["_common"] - target = "nft-metadata-crawler" - dockerfile = "docker/builder/nft-metadata-crawler.Dockerfile" - tags = generate_tags("nft-metadata-crawler") - cache-from = generate_cache_from("nft-metadata-crawler") - cache-to = generate_cache_to("nft-metadata-crawler") -} - function "generate_cache_from" { params = [target] result = CI == "true" ? [ diff --git a/docker/builder/nft-metadata-crawler.Dockerfile b/docker/builder/nft-metadata-crawler.Dockerfile deleted file mode 100644 index 4452cc1986c66..0000000000000 --- a/docker/builder/nft-metadata-crawler.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -### NFT Metadata Crawler Image ### - -FROM tools-builder - -FROM debian-base AS nft-metadata-crawler - -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ - apt-get update && apt-get install --no-install-recommends -y \ - libssl1.1 \ - ca-certificates \ - net-tools \ - tcpdump \ - iproute2 \ - netcat \ - libpq-dev \ - curl - -COPY --link --from=tools-builder /aptos/dist/aptos-nft-metadata-crawler-parser /usr/local/bin/aptos-nft-metadata-crawler-parser - -# The health check port -EXPOSE 8080