From e3724ea76b800465f3acea60c1ae7bfa6fe78a2b Mon Sep 17 00:00:00 2001 From: Jason Bosco Date: Fri, 5 Mar 2021 15:22:13 -0800 Subject: [PATCH] Update docker build --- cli/scripts/publish_docker_scraper_images.sh | 6 +++--- cli/src/commands/abstract_build_docker.py | 2 +- cli/src/commands/build_docker_scraper.py | 6 +++--- cli/src/commands/run_config_docker.py | 4 ++-- cli/src/commands/run_tests.py | 2 +- scraper/dev/docker/Dockerfile | 4 ++-- scraper/dev/docker/Dockerfile.base | 4 ++-- scraper/dev/docker/Dockerfile.dev | 4 ++-- scraper/dev/docker/Dockerfile.test | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cli/scripts/publish_docker_scraper_images.sh b/cli/scripts/publish_docker_scraper_images.sh index 91fcb43..d7d16e2 100755 --- a/cli/scripts/publish_docker_scraper_images.sh +++ b/cli/scripts/publish_docker_scraper_images.sh @@ -2,10 +2,10 @@ tag=$(git describe --abbrev=0 --tags) read -r -p "Do you wish to also deploy $tag?" yn case $yn in - [Yy]* ) ./docsearch docker:build local_tag && docker push algolia/docsearch-scraper-base:"$tag" && docker push docsearch-scraper:"$tag";; + [Yy]* ) ./docsearch docker:build local_tag && docker push typesense/docsearch-scraper-base:"$tag" && docker push docsearch-scraper:"$tag";; [Nn]* ) ./docsearch docker:build;; * ) echo "Please answer yes or no, aborting."; exit 1;; esac -docker push algolia/docsearch-scraper-base -docker push algolia/docsearch-scraper \ No newline at end of file +docker push typesense/docsearch-scraper-base +docker push typesense/docsearch-scraper \ No newline at end of file diff --git a/cli/src/commands/abstract_build_docker.py b/cli/src/commands/abstract_build_docker.py index 6dc5d09..3dadc09 100644 --- a/cli/src/commands/abstract_build_docker.py +++ b/cli/src/commands/abstract_build_docker.py @@ -3,7 +3,7 @@ class AbstractBuildDocker(AbstractCommand): @staticmethod - def build_docker_file(file, image="algolia/docsearch-scraper-dev", + def build_docker_file(file, image="typesense/docsearch-scraper-dev", local_tag=False): tags = [image] diff --git a/cli/src/commands/build_docker_scraper.py b/cli/src/commands/build_docker_scraper.py index 0f6e298..4ae2786 100644 --- a/cli/src/commands/build_docker_scraper.py +++ b/cli/src/commands/build_docker_scraper.py @@ -24,11 +24,11 @@ def run(self, args): if test: return self.build_docker_file("scraper/dev/docker/Dockerfile.test", - "algolia/docsearch-scraper-test", + "typesense/docsearch-scraper-test", local_tag=local_tag) code = self.build_docker_file("scraper/dev/docker/Dockerfile.base", - "algolia/docsearch-scraper-base", + "typesense/docsearch-scraper-base", local_tag=local_tag) if code != 0: @@ -38,4 +38,4 @@ def run(self, args): if code != 0: return code return self.build_docker_file("scraper/dev/docker/Dockerfile", - "algolia/docsearch-scraper", local_tag=local_tag) + "typesense/docsearch-scraper", local_tag=local_tag) diff --git a/cli/src/commands/run_config_docker.py b/cli/src/commands/run_config_docker.py index d755f79..a221ca4 100644 --- a/cli/src/commands/run_config_docker.py +++ b/cli/src/commands/run_config_docker.py @@ -42,10 +42,10 @@ def run(self, args): if from_local_code: container_name = "docsearch-scraper-dev" - image_name = "algolia/docsearch-scraper-dev" + image_name = "typesense/docsearch-scraper-dev" else: container_name = "docsearch-scraper" - image_name = "algolia/docsearch-scraper" + image_name = "typesense/docsearch-scraper" run_command = [ "docker", diff --git a/cli/src/commands/run_tests.py b/cli/src/commands/run_tests.py index 6a76fda..576e687 100644 --- a/cli/src/commands/run_tests.py +++ b/cli/src/commands/run_tests.py @@ -36,7 +36,7 @@ def run(self, args): "--name", "docsearch-scraper-test", "-t", - "algolia/docsearch-scraper-test"] + "typesense/docsearch-scraper-test"] return self.exec_shell_command(run_command) test_command = ["pytest", "./scraper/src"] diff --git a/scraper/dev/docker/Dockerfile b/scraper/dev/docker/Dockerfile index 9c75d62..fb5fe09 100644 --- a/scraper/dev/docker/Dockerfile +++ b/scraper/dev/docker/Dockerfile @@ -1,5 +1,5 @@ -FROM algolia/docsearch-scraper-base -LABEL maintainer="docsearch@algolia.com" +FROM typesense/docsearch-scraper-base +LABEL maintainer="contact@typesense.org" WORKDIR /root COPY scraper/src ./src diff --git a/scraper/dev/docker/Dockerfile.base b/scraper/dev/docker/Dockerfile.base index bcd2f38..7325706 100644 --- a/scraper/dev/docker/Dockerfile.base +++ b/scraper/dev/docker/Dockerfile.base @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -LABEL maintainer="docsearch@algolia.com" +LABEL maintainer="contact@typesense.org" WORKDIR /root @@ -34,7 +34,7 @@ RUN apt-get update -y && apt-get install -yq \ RUN curl -sS -o - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list RUN apt-get update -y && apt-get install -yq \ - google-chrome-stable=85.0.4183.102-1 \ + google-chrome-stable \ unzip RUN wget -q https://chromedriver.storage.googleapis.com/85.0.4183.83/chromedriver_linux64.zip RUN unzip chromedriver_linux64.zip diff --git a/scraper/dev/docker/Dockerfile.dev b/scraper/dev/docker/Dockerfile.dev index 0eedc36..2b87743 100644 --- a/scraper/dev/docker/Dockerfile.dev +++ b/scraper/dev/docker/Dockerfile.dev @@ -2,5 +2,5 @@ # - Do not COPY ./src # - Do not define an ENTRYPOINT -FROM algolia/docsearch-scraper-base -LABEL maintainer="docsearch@algolia.com" +FROM typesense/docsearch-scraper-base +LABEL maintainer="contact@typesense.org" diff --git a/scraper/dev/docker/Dockerfile.test b/scraper/dev/docker/Dockerfile.test index cd5a8fb..dcd148d 100644 --- a/scraper/dev/docker/Dockerfile.test +++ b/scraper/dev/docker/Dockerfile.test @@ -1,5 +1,5 @@ -FROM algolia/docsearch-scraper-base -LABEL maintainer="docsearch@algolia.com" +FROM typesense/docsearch-scraper-base +LABEL maintainer="contact@typesense.org" WORKDIR /root