From d6823172043919380384a5e673bda9624248d5ba Mon Sep 17 00:00:00 2001 From: jtotoole Date: Sat, 10 Jul 2021 15:54:29 -0400 Subject: [PATCH 1/2] move to docker hub from gcr --- .github/workflows/build.yml | 12 +- apps/cliff-annotator-webapp-proxy/Dockerfile | 2 +- apps/cliff-annotator/Dockerfile | 2 +- .../cliff-fetch-annotation-and-tag/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/common/Dockerfile | 2 +- apps/common/docker-compose.tests.yml | 16 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/crawler-ap/Dockerfile | 2 +- apps/crawler-ap/docker-compose.tests.yml | 12 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/crawler-fetcher/Dockerfile | 2 +- apps/crawler-fetcher/docker-compose.tests.yml | 8 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/crawler-provider/Dockerfile | 2 +- .../crawler-provider/docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/create-missing-partitions/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/cron-base/Dockerfile | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/cron-generate-daily-rss-dumps/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/cron-generate-media-health/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/cron-generate-user-summary/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- .../Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/cron-refresh-stats/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/cron-rescrape-due-media/Dockerfile | 2 +- .../docker-compose.tests.yml | 8 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/cron-rescraping-changes/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- .../Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- .../cron-set-media-subject-country/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/docker-compose.dist.yml | 124 ++++++------- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/dump-table/Dockerfile | 2 +- apps/dump-table/docker-compose.tests.yml | 6 +- apps/elasticsearch-base/Dockerfile | 2 +- apps/elk-elasticsearch/Dockerfile | 2 +- apps/elk-filebeat/Dockerfile | 2 +- apps/elk-journalbeat/Dockerfile | 2 +- apps/elk-kibana/Dockerfile | 2 +- apps/elk-kibana/docker-compose.tests.yml | 8 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- .../Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/extract-and-vector/Dockerfile | 2 +- .../docker-compose.tests.yml | 10 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/extract-article-from-page/Dockerfile | 2 +- .../docker-compose.tests.yml | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/facebook-fetch-story-stats/Dockerfile | 2 +- .../docker-compose.tests.yml | 8 +- .../.idea/perl5local.xml | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/import-solr-data-for-testing/Dockerfile | 2 +- .../docker-compose.tests.yml | 12 +- apps/import-solr-data/.idea/perl5local.xml | 166 +++++++++--------- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/import-solr-data/Dockerfile | 2 +- .../import-solr-data/docker-compose.tests.yml | 14 +- apps/import-stories-base/Dockerfile | 2 +- .../docker-compose.tests.yml | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/import-stories-feedly/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/import-stories-scrapehtml/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/java-base/Dockerfile | 2 +- apps/mail-opendkim-server/Dockerfile | 2 +- apps/mail-postfix-server/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/mirror-cpan-on-s3/Dockerfile | 2 +- apps/munin-cron/Dockerfile | 2 +- apps/munin-cron/docker-compose.tests.yml | 12 +- apps/munin-fastcgi-graph/Dockerfile | 2 +- apps/munin-httpd/Dockerfile | 2 +- apps/munin-httpd/docker-compose.tests.yml | 16 +- apps/munin-node/Dockerfile | 2 +- apps/munin-node/docker-compose.tests.yml | 10 +- apps/nginx-base/Dockerfile | 2 +- .../Dockerfile | 2 +- apps/nytlabels-annotator/.idea/misc.xml | 2 +- .../.idea/nytlabels-annotator.iml | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/nytlabels-annotator/Dockerfile | 2 +- apps/nytlabels-annotator/README.md | 2 +- .../Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/perl-python-base/Dockerfile | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/podcast-transcribe-episode/Dockerfile | 2 +- .../docker-compose.tests.yml | 16 +- apps/postgresql-base/Dockerfile | 2 +- apps/postgresql-pgbouncer/Dockerfile | 2 +- apps/postgresql-repo-base/Dockerfile | 2 +- apps/postgresql-server/Dockerfile | 2 +- apps/postgresql-upgrade/.idea/misc.xml | 2 +- .../.idea/postgresql-upgrade.iml | 2 +- apps/postgresql-upgrade/Dockerfile | 2 +- .../bin/postgresql_upgrade.py | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/purge-object-caches/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/rabbitmq-server-webapp-proxy/Dockerfile | 2 +- .../docker-compose.tests.yml | 4 +- apps/rabbitmq-server/Dockerfile | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/rescrape-media/Dockerfile | 2 +- apps/rescrape-media/docker-compose.tests.yml | 8 +- apps/sitemap-fetch-media-pages/.idea/misc.xml | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- .../.idea/sitemap-fetch-media-pages.iml | 2 +- apps/sitemap-fetch-media-pages/Dockerfile | 2 +- apps/solr-base/Dockerfile | 2 +- apps/solr-shard-webapp-proxy/Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- apps/solr-shard/Dockerfile | 2 +- apps/solr-shard/docker-compose.tests.yml | 4 +- apps/solr-zookeeper/Dockerfile | 2 +- apps/temporal-elasticsearch/Dockerfile | 2 +- apps/temporal-grafana/Dockerfile | 2 +- apps/temporal-postgresql/Dockerfile | 2 +- apps/temporal-prometheus/Dockerfile | 2 +- apps/temporal-server/Dockerfile | 2 +- apps/temporal-server/docker-compose.tests.yml | 14 +- apps/temporal-webapp/Dockerfile | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/tools/Dockerfile | 2 +- apps/tools/docker-compose.tests.yml | 12 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/topics-base/Dockerfile | 2 +- apps/topics-base/docker-compose.tests.yml | 12 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/topics-extract-story-links/Dockerfile | 2 +- .../docker-compose.tests.yml | 8 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/topics-fetch-link/Dockerfile | 2 +- .../docker-compose.tests.yml | 12 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/topics-fetch-twitter-urls/Dockerfile | 2 +- .../docker-compose.tests.yml | 12 +- .../.idea/runConfigurations/Unnamed.xml | 4 +- apps/topics-map/Dockerfile | 2 +- apps/topics-map/docker-compose.tests.yml | 6 +- apps/topics-mine-public/Dockerfile | 2 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/topics-mine/Dockerfile | 2 +- apps/topics-mine/docker-compose.tests.yml | 16 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/topics-snapshot/Dockerfile | 2 +- apps/topics-snapshot/docker-compose.tests.yml | 16 +- .../.idea/runConfigurations/Dockerfile.xml | 4 +- apps/webapp-api/Dockerfile | 2 +- apps/webapp-api/docker-compose.tests.yml | 24 +-- apps/webapp-httpd/Dockerfile | 2 +- apps/webapp-httpd/docker-compose.tests.yml | 24 +-- .../.idea/runConfigurations/Dockerfile.xml | 4 +- .../Dockerfile | 2 +- .../docker-compose.tests.yml | 6 +- dev/build.py | 2 +- dev/remove_all_containers.sh | 2 +- dev/test_utils.py | 2 +- dev/utils.py | 2 +- doc/creating_apps.markdown | 16 +- doc/dev_scripts.markdown | 16 +- doc/docker_cheat_sheet.markdown | 14 +- doc/postgresql_upgrade.markdown | 6 +- doc/pycharm.markdown | 8 +- doc/tools.markdown | 16 +- 188 files changed, 578 insertions(+), 582 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 417bddc68d..09649590df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,10 +50,8 @@ jobs: docker version docker-compose version - - name: Log in to container registry - run: echo "${DOCKER_GCR_SERVICE_ACCOUNT}" | docker login -u _json_key --password-stdin https://gcr.io - env: - DOCKER_GCR_SERVICE_ACCOUNT: ${{ secrets.DOCKER_GCR_SERVICE_ACCOUNT }} + - name: Log into Docker Hub + run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin - name: Pull images # Don't stop on a single failure because the image might not exist or a @@ -125,10 +123,8 @@ jobs: docker version docker-compose version - - name: Log in to container registry - run: echo "${DOCKER_GCR_SERVICE_ACCOUNT}" | docker login -u _json_key --password-stdin https://gcr.io - env: - DOCKER_GCR_SERVICE_ACCOUNT: ${{ secrets.DOCKER_GCR_SERVICE_ACCOUNT }} + - name: Log into Docker Hub + run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin - name: Pull images # Don't stop on a single failure because the image might not exist or a diff --git a/apps/cliff-annotator-webapp-proxy/Dockerfile b/apps/cliff-annotator-webapp-proxy/Dockerfile index 244c41d949..efce70e65f 100644 --- a/apps/cliff-annotator-webapp-proxy/Dockerfile +++ b/apps/cliff-annotator-webapp-proxy/Dockerfile @@ -2,7 +2,7 @@ # Proxy to CLIFF annotator, roundrobins between cliff-annotator instances # -FROM gcr.io/mcback/nginx-base:latest +FROM mc2021/nginx-base:latest # Copy configuration COPY nginx/include/cliff-annotator-webapp-proxy.conf /etc/nginx/include/ diff --git a/apps/cliff-annotator/Dockerfile b/apps/cliff-annotator/Dockerfile index df2ccad7e5..b39921d204 100644 --- a/apps/cliff-annotator/Dockerfile +++ b/apps/cliff-annotator/Dockerfile @@ -2,7 +2,7 @@ # CLIFF annotator service # -FROM gcr.io/mcback/java-base:latest +FROM mc2021/java-base:latest ENV PATH="/usr/lib/maven/bin:/usr/lib/tomcat7/bin:${PATH}" \ # diff --git a/apps/cliff-fetch-annotation-and-tag/Dockerfile b/apps/cliff-fetch-annotation-and-tag/Dockerfile index bd94b386ad..e0e11eb204 100644 --- a/apps/cliff-fetch-annotation-and-tag/Dockerfile +++ b/apps/cliff-fetch-annotation-and-tag/Dockerfile @@ -2,7 +2,7 @@ # CLIFF fetch annotation + tag worker # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/cliff-fetch-annotation-and-tag/ diff --git a/apps/cliff-fetch-annotation-and-tag/docker-compose.tests.yml b/apps/cliff-fetch-annotation-and-tag/docker-compose.tests.yml index a97835a29f..df908b83a8 100644 --- a/apps/cliff-fetch-annotation-and-tag/docker-compose.tests.yml +++ b/apps/cliff-fetch-annotation-and-tag/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cliff-fetch-annotation-and-tag: - image: gcr.io/mcback/cliff-fetch-annotation-and-tag:latest + image: mc2021/cliff-fetch-annotation-and-tag:latest init: true stop_signal: SIGKILL environment: @@ -28,7 +28,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -41,7 +41,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/common/.idea/runConfigurations/Dockerfile.xml b/apps/common/.idea/runConfigurations/Dockerfile.xml index 70bc014ab3..3d217e7199 100644 --- a/apps/common/.idea/runConfigurations/Dockerfile.xml +++ b/apps/common/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/common/Dockerfile b/apps/common/Dockerfile index 30f777d19c..a05afe458b 100644 --- a/apps/common/Dockerfile +++ b/apps/common/Dockerfile @@ -2,7 +2,7 @@ # Common Media Cloud code # -FROM gcr.io/mcback/perl-python-base:latest +FROM mc2021/perl-python-base:latest # Install mecab-ipadic-neologd (for Japanese language tokenization) first because it's so large RUN \ diff --git a/apps/common/docker-compose.tests.yml b/apps/common/docker-compose.tests.yml index 17126383ee..6b914eaa62 100644 --- a/apps/common/docker-compose.tests.yml +++ b/apps/common/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: common: - image: gcr.io/mcback/common:latest + image: mc2021/common:latest init: true stop_signal: SIGKILL environment: @@ -34,7 +34,7 @@ services: - rabbitmq-server extract-article-from-page: - image: gcr.io/mcback/extract-article-from-page:latest + image: mc2021/extract-article-from-page:latest init: true stop_signal: SIGKILL expose: @@ -51,7 +51,7 @@ services: target: /opt/mediacloud/src/common/ import-solr-data-for-testing: - image: gcr.io/mcback/import-solr-data-for-testing:latest + image: mc2021/import-solr-data-for-testing:latest init: true environment: MC_SOLR_IMPORT_MAX_QUEUED_STORIES: 100000 @@ -71,7 +71,7 @@ services: - solr-shard-01 postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -84,7 +84,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -101,7 +101,7 @@ services: target: /etc/postgresql/13/main/ solr-shard-01: - image: gcr.io/mcback/solr-shard:latest + image: mc2021/solr-shard:latest init: true stop_signal: SIGKILL environment: @@ -119,7 +119,7 @@ services: - solr-zookeeper solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:latest + image: mc2021/solr-zookeeper:latest init: true stop_signal: SIGKILL expose: @@ -135,7 +135,7 @@ services: target: /zookeeper.sh rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/crawler-ap/.idea/runConfigurations/Dockerfile.xml b/apps/crawler-ap/.idea/runConfigurations/Dockerfile.xml index b6a15b2ca1..b500c9d3f4 100644 --- a/apps/crawler-ap/.idea/runConfigurations/Dockerfile.xml +++ b/apps/crawler-ap/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/crawler-ap/Dockerfile b/apps/crawler-ap/Dockerfile index c585f00325..6ea0662b53 100644 --- a/apps/crawler-ap/Dockerfile +++ b/apps/crawler-ap/Dockerfile @@ -2,7 +2,7 @@ # AP crawler # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Install Python dependencies COPY src/requirements.txt /var/tmp/ diff --git a/apps/crawler-ap/docker-compose.tests.yml b/apps/crawler-ap/docker-compose.tests.yml index 2ea0f17570..31edd823b4 100644 --- a/apps/crawler-ap/docker-compose.tests.yml +++ b/apps/crawler-ap/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: crawler-ap: - image: gcr.io/mcback/crawler-ap:latest + image: mc2021/crawler-ap:latest init: true stop_signal: SIGKILL environment: @@ -30,7 +30,7 @@ services: - extract-and-vector extract-and-vector: - image: gcr.io/mcback/extract-and-vector:latest + image: mc2021/extract-and-vector:latest init: true stop_signal: SIGKILL volumes: @@ -50,7 +50,7 @@ services: - rabbitmq-server extract-article-from-page: - image: gcr.io/mcback/extract-article-from-page:latest + image: mc2021/extract-article-from-page:latest init: true stop_signal: SIGKILL expose: @@ -67,7 +67,7 @@ services: target: /opt/mediacloud/src/common/ postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -80,7 +80,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -97,7 +97,7 @@ services: target: /etc/postgresql/13/main/ rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/crawler-fetcher/.idea/runConfigurations/Dockerfile.xml b/apps/crawler-fetcher/.idea/runConfigurations/Dockerfile.xml index f85e40f8c3..f958109d4f 100644 --- a/apps/crawler-fetcher/.idea/runConfigurations/Dockerfile.xml +++ b/apps/crawler-fetcher/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/crawler-fetcher/Dockerfile b/apps/crawler-fetcher/Dockerfile index 48433a62fc..82b63a48c6 100644 --- a/apps/crawler-fetcher/Dockerfile +++ b/apps/crawler-fetcher/Dockerfile @@ -2,7 +2,7 @@ # Crawler fetcher # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/crawler-fetcher/ diff --git a/apps/crawler-fetcher/docker-compose.tests.yml b/apps/crawler-fetcher/docker-compose.tests.yml index fb3cb718a7..3236a3e740 100644 --- a/apps/crawler-fetcher/docker-compose.tests.yml +++ b/apps/crawler-fetcher/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: crawler-fetcher: - image: gcr.io/mcback/crawler-fetcher:latest + image: mc2021/crawler-fetcher:latest init: true stop_signal: SIGKILL environment: @@ -30,7 +30,7 @@ services: - rabbitmq-server postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -43,7 +43,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -60,7 +60,7 @@ services: target: /etc/postgresql/13/main/ rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/crawler-provider/.idea/runConfigurations/Dockerfile.xml b/apps/crawler-provider/.idea/runConfigurations/Dockerfile.xml index d35a013a97..ca1dd37e3c 100644 --- a/apps/crawler-provider/.idea/runConfigurations/Dockerfile.xml +++ b/apps/crawler-provider/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/crawler-provider/Dockerfile b/apps/crawler-provider/Dockerfile index cf8cb2adb0..a7940bb2b3 100644 --- a/apps/crawler-provider/Dockerfile +++ b/apps/crawler-provider/Dockerfile @@ -2,7 +2,7 @@ # Crawler provider # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/crawler-provider/ diff --git a/apps/crawler-provider/docker-compose.tests.yml b/apps/crawler-provider/docker-compose.tests.yml index 0cfd0cbdfd..00985518c1 100644 --- a/apps/crawler-provider/docker-compose.tests.yml +++ b/apps/crawler-provider/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: crawler-provider: - image: gcr.io/mcback/crawler-provider:latest + image: mc2021/crawler-provider:latest init: true stop_signal: SIGKILL volumes: @@ -23,7 +23,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -36,7 +36,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/create-missing-partitions/.idea/runConfigurations/Dockerfile.xml b/apps/create-missing-partitions/.idea/runConfigurations/Dockerfile.xml index 65bcaee6c7..cb664634d6 100644 --- a/apps/create-missing-partitions/.idea/runConfigurations/Dockerfile.xml +++ b/apps/create-missing-partitions/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/create-missing-partitions/Dockerfile b/apps/create-missing-partitions/Dockerfile index ecb4278fe9..3d4cd7e2bf 100644 --- a/apps/create-missing-partitions/Dockerfile +++ b/apps/create-missing-partitions/Dockerfile @@ -2,7 +2,7 @@ # Create missing PostgreSQL table partitions # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest COPY bin /opt/mediacloud/bin diff --git a/apps/create-missing-partitions/docker-compose.tests.yml b/apps/create-missing-partitions/docker-compose.tests.yml index a454e2a84b..b9eb38cefb 100644 --- a/apps/create-missing-partitions/docker-compose.tests.yml +++ b/apps/create-missing-partitions/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: create-missing-partitions: - image: gcr.io/mcback/create-missing-partitions:latest + image: mc2021/create-missing-partitions:latest init: true stop_signal: SIGKILL volumes: @@ -17,7 +17,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -30,7 +30,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-base/Dockerfile b/apps/cron-base/Dockerfile index 66a45c4ba6..25a8385f05 100644 --- a/apps/cron-base/Dockerfile +++ b/apps/cron-base/Dockerfile @@ -3,7 +3,7 @@ # # FIXME email the report -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Install Cron RUN \ diff --git a/apps/cron-generate-daily-rss-dumps/.idea/runConfigurations/Dockerfile.xml b/apps/cron-generate-daily-rss-dumps/.idea/runConfigurations/Dockerfile.xml index 024dd77867..e64fb5753f 100644 --- a/apps/cron-generate-daily-rss-dumps/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-generate-daily-rss-dumps/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-generate-daily-rss-dumps/Dockerfile b/apps/cron-generate-daily-rss-dumps/Dockerfile index 95e170fd6a..8456dd8cce 100644 --- a/apps/cron-generate-daily-rss-dumps/Dockerfile +++ b/apps/cron-generate-daily-rss-dumps/Dockerfile @@ -2,7 +2,7 @@ # Generate daily RSS dumps Cron job # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Install Perl dependencies COPY src/cpanfile /var/tmp/ diff --git a/apps/cron-generate-daily-rss-dumps/docker-compose.tests.yml b/apps/cron-generate-daily-rss-dumps/docker-compose.tests.yml index 56fdc8b91e..7f1e71e2a2 100644 --- a/apps/cron-generate-daily-rss-dumps/docker-compose.tests.yml +++ b/apps/cron-generate-daily-rss-dumps/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-generate-daily-rss-dumps: - image: gcr.io/mcback/cron-generate-daily-rss-dumps:latest + image: mc2021/cron-generate-daily-rss-dumps:latest init: true stop_signal: SIGKILL volumes: @@ -20,7 +20,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -33,7 +33,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-generate-media-health/.idea/runConfigurations/Dockerfile.xml b/apps/cron-generate-media-health/.idea/runConfigurations/Dockerfile.xml index 7ecb72fec7..3796577fd7 100644 --- a/apps/cron-generate-media-health/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-generate-media-health/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-generate-media-health/Dockerfile b/apps/cron-generate-media-health/Dockerfile index 966ae20b2e..fb3f5b2a22 100644 --- a/apps/cron-generate-media-health/Dockerfile +++ b/apps/cron-generate-media-health/Dockerfile @@ -2,7 +2,7 @@ # Generate media health Cron job # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy sources COPY src/ /opt/mediacloud/src/cron-generate-media-health/ diff --git a/apps/cron-generate-media-health/docker-compose.tests.yml b/apps/cron-generate-media-health/docker-compose.tests.yml index 74b389d3e9..83e72c4ce4 100644 --- a/apps/cron-generate-media-health/docker-compose.tests.yml +++ b/apps/cron-generate-media-health/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-generate-media-health: - image: gcr.io/mcback/cron-generate-media-health:latest + image: mc2021/cron-generate-media-health:latest init: true stop_signal: SIGKILL volumes: @@ -26,7 +26,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -39,7 +39,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-generate-user-summary/.idea/runConfigurations/Dockerfile.xml b/apps/cron-generate-user-summary/.idea/runConfigurations/Dockerfile.xml index 47ac260daa..d9fccb3b4f 100644 --- a/apps/cron-generate-user-summary/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-generate-user-summary/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-generate-user-summary/Dockerfile b/apps/cron-generate-user-summary/Dockerfile index 86fb3349da..fad578b11d 100644 --- a/apps/cron-generate-user-summary/Dockerfile +++ b/apps/cron-generate-user-summary/Dockerfile @@ -2,7 +2,7 @@ # Generate daily and weekly user summaries Cron job # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy Cron script COPY bin /opt/mediacloud/bin diff --git a/apps/cron-generate-user-summary/docker-compose.tests.yml b/apps/cron-generate-user-summary/docker-compose.tests.yml index 1ac0b72ada..e7d77dbbfd 100644 --- a/apps/cron-generate-user-summary/docker-compose.tests.yml +++ b/apps/cron-generate-user-summary/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-generate-user-summary: - image: gcr.io/mcback/cron-generate-user-summary:latest + image: mc2021/cron-generate-user-summary:latest init: true stop_signal: SIGKILL volumes: @@ -20,7 +20,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -33,7 +33,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-print-long-running-job-states/.idea/runConfigurations/Dockerfile.xml b/apps/cron-print-long-running-job-states/.idea/runConfigurations/Dockerfile.xml index 2b3c42343c..4a02801a7f 100644 --- a/apps/cron-print-long-running-job-states/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-print-long-running-job-states/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-print-long-running-job-states/Dockerfile b/apps/cron-print-long-running-job-states/Dockerfile index 3d3422a2ea..623b7a8f54 100644 --- a/apps/cron-print-long-running-job-states/Dockerfile +++ b/apps/cron-print-long-running-job-states/Dockerfile @@ -2,7 +2,7 @@ # Print long running job states # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy Cron script COPY bin /opt/mediacloud/bin diff --git a/apps/cron-print-long-running-job-states/docker-compose.tests.yml b/apps/cron-print-long-running-job-states/docker-compose.tests.yml index f2eb667e72..c4e8715e69 100644 --- a/apps/cron-print-long-running-job-states/docker-compose.tests.yml +++ b/apps/cron-print-long-running-job-states/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-print-long-running-job-states: - image: gcr.io/mcback/cron-print-long-running-job-states:latest + image: mc2021/cron-print-long-running-job-states:latest init: true stop_signal: SIGKILL volumes: @@ -20,7 +20,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -33,7 +33,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-refresh-stats/.idea/runConfigurations/Dockerfile.xml b/apps/cron-refresh-stats/.idea/runConfigurations/Dockerfile.xml index b6002bff45..984181e623 100644 --- a/apps/cron-refresh-stats/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-refresh-stats/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-refresh-stats/Dockerfile b/apps/cron-refresh-stats/Dockerfile index e8a24b7238..381cf0e2df 100644 --- a/apps/cron-refresh-stats/Dockerfile +++ b/apps/cron-refresh-stats/Dockerfile @@ -2,7 +2,7 @@ # Refresh stats Cron job # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy Cron script COPY bin /opt/mediacloud/bin diff --git a/apps/cron-refresh-stats/docker-compose.tests.yml b/apps/cron-refresh-stats/docker-compose.tests.yml index 9af8e30be6..2ded381165 100644 --- a/apps/cron-refresh-stats/docker-compose.tests.yml +++ b/apps/cron-refresh-stats/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-refresh-stats: - image: gcr.io/mcback/cron-refresh-stats:latest + image: mc2021/cron-refresh-stats:latest init: true stop_signal: SIGKILL volumes: @@ -20,7 +20,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -33,7 +33,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-rescrape-due-media/.idea/runConfigurations/Dockerfile.xml b/apps/cron-rescrape-due-media/.idea/runConfigurations/Dockerfile.xml index 87d51b65aa..389b789a31 100644 --- a/apps/cron-rescrape-due-media/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-rescrape-due-media/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-rescrape-due-media/Dockerfile b/apps/cron-rescrape-due-media/Dockerfile index c0e50a4946..0818f7ba8a 100644 --- a/apps/cron-rescrape-due-media/Dockerfile +++ b/apps/cron-rescrape-due-media/Dockerfile @@ -7,7 +7,7 @@ # # FIXME disable initially -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy worker script COPY bin /opt/mediacloud/bin diff --git a/apps/cron-rescrape-due-media/docker-compose.tests.yml b/apps/cron-rescrape-due-media/docker-compose.tests.yml index 1b321172a7..d6ba9b131b 100644 --- a/apps/cron-rescrape-due-media/docker-compose.tests.yml +++ b/apps/cron-rescrape-due-media/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-rescrape-due-media: - image: gcr.io/mcback/cron-rescrape-due-media:latest + image: mc2021/cron-rescrape-due-media:latest init: true stop_signal: SIGKILL volumes: @@ -21,7 +21,7 @@ services: - rabbitmq-server postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -34,7 +34,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -51,7 +51,7 @@ services: target: /etc/postgresql/13/main/ rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-rescraping-changes/.idea/runConfigurations/Dockerfile.xml b/apps/cron-rescraping-changes/.idea/runConfigurations/Dockerfile.xml index 618e67d4a8..dbea91a4a7 100644 --- a/apps/cron-rescraping-changes/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-rescraping-changes/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-rescraping-changes/Dockerfile b/apps/cron-rescraping-changes/Dockerfile index acf26f643f..1b3737aa83 100644 --- a/apps/cron-rescraping-changes/Dockerfile +++ b/apps/cron-rescraping-changes/Dockerfile @@ -7,7 +7,7 @@ # # FIXME disable initially -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy worker script COPY bin /opt/mediacloud/bin diff --git a/apps/cron-rescraping-changes/docker-compose.tests.yml b/apps/cron-rescraping-changes/docker-compose.tests.yml index a563decac7..373876af2c 100644 --- a/apps/cron-rescraping-changes/docker-compose.tests.yml +++ b/apps/cron-rescraping-changes/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-rescraping-changes: - image: gcr.io/mcback/cron-rescraping-changes:latest + image: mc2021/cron-rescraping-changes:latest init: true stop_signal: SIGKILL volumes: @@ -20,7 +20,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -33,7 +33,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-set-media-primary-language/.idea/runConfigurations/Dockerfile.xml b/apps/cron-set-media-primary-language/.idea/runConfigurations/Dockerfile.xml index 49a1c84a77..eff2a69d3c 100644 --- a/apps/cron-set-media-primary-language/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-set-media-primary-language/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-set-media-primary-language/Dockerfile b/apps/cron-set-media-primary-language/Dockerfile index f529bd99be..709fd59328 100644 --- a/apps/cron-set-media-primary-language/Dockerfile +++ b/apps/cron-set-media-primary-language/Dockerfile @@ -2,7 +2,7 @@ # Set primary media language Cron job # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy sources COPY src/ /opt/mediacloud/src/cron-set-media-primary-language/ diff --git a/apps/cron-set-media-primary-language/docker-compose.tests.yml b/apps/cron-set-media-primary-language/docker-compose.tests.yml index f4e0ca5bf7..f07d4515cf 100644 --- a/apps/cron-set-media-primary-language/docker-compose.tests.yml +++ b/apps/cron-set-media-primary-language/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-set-media-primary-language: - image: gcr.io/mcback/cron-set-media-primary-language:latest + image: mc2021/cron-set-media-primary-language:latest init: true stop_signal: SIGKILL volumes: @@ -26,7 +26,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -39,7 +39,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/cron-set-media-subject-country/.idea/runConfigurations/Dockerfile.xml b/apps/cron-set-media-subject-country/.idea/runConfigurations/Dockerfile.xml index b895f159ca..ff48b89d53 100644 --- a/apps/cron-set-media-subject-country/.idea/runConfigurations/Dockerfile.xml +++ b/apps/cron-set-media-subject-country/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/cron-set-media-subject-country/Dockerfile b/apps/cron-set-media-subject-country/Dockerfile index 7ac70adc85..c18ee65d9a 100644 --- a/apps/cron-set-media-subject-country/Dockerfile +++ b/apps/cron-set-media-subject-country/Dockerfile @@ -2,7 +2,7 @@ # Set media's subject country Cron job # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # Copy sources COPY src/ /opt/mediacloud/src/cron-set-media-subject-country/ diff --git a/apps/cron-set-media-subject-country/docker-compose.tests.yml b/apps/cron-set-media-subject-country/docker-compose.tests.yml index 01864f5a44..fac5ed4966 100644 --- a/apps/cron-set-media-subject-country/docker-compose.tests.yml +++ b/apps/cron-set-media-subject-country/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: cron-set-media-subject-country: - image: gcr.io/mcback/cron-set-media-subject-country:latest + image: mc2021/cron-set-media-subject-country:latest init: true stop_signal: SIGKILL volumes: @@ -26,7 +26,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -39,7 +39,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/docker-compose.dist.yml b/apps/docker-compose.dist.yml index 7113675abc..9fe548d8c2 100644 --- a/apps/docker-compose.dist.yml +++ b/apps/docker-compose.dist.yml @@ -181,7 +181,7 @@ x-brandwatch-api-configuration: &brandwatch-api-configuration # "deploy/replicas", we define every shard as its own independent service. # x-solr-shard_base: &solr-shard_base - image: gcr.io/mcback/solr-shard:release + image: mc2021/solr-shard:release init: true environment: # Shard count (every individual shard needs to know the total count) @@ -272,7 +272,7 @@ services: # ----------------------- # cliff-annotator: - image: gcr.io/mcback/cliff-annotator:release + image: mc2021/cliff-annotator:release init: true networks: - default @@ -295,7 +295,7 @@ services: # --------------------------------------- # cliff-annotator-webapp-proxy: - image: gcr.io/mcback/cliff-annotator-webapp-proxy:release + image: mc2021/cliff-annotator-webapp-proxy:release init: true networks: - default @@ -322,7 +322,7 @@ services: # ----------------------- # cliff-update-story-tags: - image: gcr.io/mcback/cliff-fetch-annotation-and-tag:release + image: mc2021/cliff-fetch-annotation-and-tag:release init: true networks: - default @@ -358,7 +358,7 @@ services: # ---------- # crawler-ap: - image: gcr.io/mcback/crawler-ap:release + image: mc2021/crawler-ap:release init: true networks: - default @@ -386,7 +386,7 @@ services: # --------------- # crawler-fetcher: - image: gcr.io/mcback/crawler-fetcher:release + image: mc2021/crawler-fetcher:release init: true networks: - default @@ -416,7 +416,7 @@ services: # ---------------- # crawler-provider: - image: gcr.io/mcback/crawler-provider:release + image: mc2021/crawler-provider:release init: true networks: - default @@ -439,7 +439,7 @@ services: # ------------------------------------ # create-missing-partitions: - image: gcr.io/mcback/create-missing-partitions:release + image: mc2021/create-missing-partitions:release init: true networks: - default @@ -462,7 +462,7 @@ services: # --------------------------------- # cron-generate-daily-rss-dumps: - image: gcr.io/mcback/cron-generate-daily-rss-dumps:release + image: mc2021/cron-generate-daily-rss-dumps:release init: true networks: - default @@ -492,7 +492,7 @@ services: # ------------------------------------- # cron-generate-media-health: - image: gcr.io/mcback/cron-generate-media-health:release + image: mc2021/cron-generate-media-health:release init: true networks: - default @@ -515,7 +515,7 @@ services: # --------------------------------------------- # cron-generate-user-summary: - image: gcr.io/mcback/cron-generate-user-summary:release + image: mc2021/cron-generate-user-summary:release init: true networks: - default @@ -538,7 +538,7 @@ services: # ----------------------------- # cron-print-long-running-job-states: - image: gcr.io/mcback/cron-print-long-running-job-states:release + image: mc2021/cron-print-long-running-job-states:release init: true networks: - default @@ -561,7 +561,7 @@ services: # ---------------------- # cron-refresh-stats: - image: gcr.io/mcback/cron-refresh-stats:release + image: mc2021/cron-refresh-stats:release init: true networks: - default @@ -584,7 +584,7 @@ services: # ---------------------------------------------- # cron-rescrape-due-media: - image: gcr.io/mcback/cron-rescrape-due-media:release + image: mc2021/cron-rescrape-due-media:release init: true networks: - default @@ -608,7 +608,7 @@ services: # ---------------------------------- # cron-rescraping-changes: - image: gcr.io/mcback/cron-rescraping-changes:release + image: mc2021/cron-rescraping-changes:release init: true networks: - default @@ -631,7 +631,7 @@ services: # ----------------------------------- # cron-set-media-primary-language: - image: gcr.io/mcback/cron-set-media-primary-language:release + image: mc2021/cron-set-media-primary-language:release init: true networks: - default @@ -654,7 +654,7 @@ services: # ----------------------------------- # cron-set-media-subject-country: - image: gcr.io/mcback/cron-set-media-subject-country:release + image: mc2021/cron-set-media-subject-country:release init: true networks: - default @@ -677,7 +677,7 @@ services: # -------------------------------- # elk-elasticsearch: - image: gcr.io/mcback/elk-elasticsearch:release + image: mc2021/elk-elasticsearch:release init: true networks: - default @@ -713,7 +713,7 @@ services: # ---------------------------------------- # elk-filebeat: - image: gcr.io/mcback/elk-filebeat:release + image: mc2021/elk-filebeat:release init: true networks: - default @@ -743,7 +743,7 @@ services: # ----------------------------------------- # elk-journalbeat: - image: gcr.io/mcback/elk-journalbeat:release + image: mc2021/elk-journalbeat:release init: true networks: - default @@ -771,7 +771,7 @@ services: # ------------------------------ # elk-kibana: - image: gcr.io/mcback/elk-kibana:release + image: mc2021/elk-kibana:release init: true networks: - default @@ -799,7 +799,7 @@ services: # -------------------------- # extract-and-vector: - image: gcr.io/mcback/extract-and-vector:release + image: mc2021/extract-and-vector:release init: true networks: - default @@ -826,7 +826,7 @@ services: # ----------------------------------- # extract-article-from-page: - image: gcr.io/mcback/extract-article-from-page:release + image: mc2021/extract-article-from-page:release init: true networks: - default @@ -852,7 +852,7 @@ services: # ------------------------------- # facebook-fetch-story-stats: - image: gcr.io/mcback/facebook-fetch-story-stats:release + image: mc2021/facebook-fetch-story-stats:release init: true networks: - default @@ -887,7 +887,7 @@ services: # ------------------------ # import-solr-data: - image: gcr.io/mcback/import-solr-data:release + image: mc2021/import-solr-data:release init: true networks: - default @@ -914,7 +914,7 @@ services: # --------------------------------- # import-stories-feedly: - image: gcr.io/mcback/import-stories-feedly:release + image: mc2021/import-stories-feedly:release init: true networks: - default @@ -938,7 +938,7 @@ services: # --------------- # mail-opendkim-server: - image: gcr.io/mcback/mail-opendkim-server:release + image: mc2021/mail-opendkim-server:release init: true networks: - default @@ -968,7 +968,7 @@ services: # --------------- # mail-postfix-server: - image: gcr.io/mcback/mail-postfix-server:release + image: mc2021/mail-postfix-server:release init: true networks: - default @@ -1019,7 +1019,7 @@ services: # -------------------------- # munin-cron: - image: gcr.io/mcback/munin-cron:release + image: mc2021/munin-cron:release # Docker doesn't reap zombie processes properly # (https://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/), # and Munin runs all kinds of plugins which might not take care of their children properly. @@ -1054,7 +1054,7 @@ services: # ----------------------------- # munin-fastcgi-graph: - image: gcr.io/mcback/munin-fastcgi-graph:release + image: mc2021/munin-fastcgi-graph:release init: true networks: - default @@ -1085,7 +1085,7 @@ services: # ----------------- # munin-httpd: - image: gcr.io/mcback/munin-httpd:release + image: mc2021/munin-httpd:release init: true networks: - default @@ -1120,7 +1120,7 @@ services: # ---------- # munin-node: - image: gcr.io/mcback/munin-node:release + image: mc2021/munin-node:release # Docker doesn't reap zombie processes properly # (https://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/), # and Munin runs all kinds of plugins which might not take care of their children properly. @@ -1147,7 +1147,7 @@ services: # ----------------------------- # nytlabels-annotator: - image: gcr.io/mcback/nytlabels-annotator:release + image: mc2021/nytlabels-annotator:release init: true networks: - default @@ -1170,7 +1170,7 @@ services: # ------------------------------------------- # nytlabels-annotator-webapp-proxy: - image: gcr.io/mcback/nytlabels-annotator-webapp-proxy:release + image: mc2021/nytlabels-annotator-webapp-proxy:release init: true networks: - default @@ -1198,7 +1198,7 @@ services: # ----------------------- # nytlabels-fetch-annotation-and-tag: - image: gcr.io/mcback/nytlabels-fetch-annotation-and-tag:release + image: mc2021/nytlabels-fetch-annotation-and-tag:release init: true networks: - default @@ -1229,7 +1229,7 @@ services: # ----------------------------------------------------------------- # podcast-transcribe-episode-rabbitmq-worker: - image: gcr.io/mcback/podcast-transcribe-episode:release + image: mc2021/podcast-transcribe-episode:release command: "rabbitmq_worker.py" init: true networks: @@ -1262,7 +1262,7 @@ services: # ----------------------------------------------------------------- # podcast-transcribe-episode-temporal-worker: - image: gcr.io/mcback/podcast-transcribe-episode:release + image: mc2021/podcast-transcribe-episode:release command: "workflow_worker.py" init: true networks: @@ -1327,7 +1327,7 @@ services: # --------- # postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:release + image: mc2021/postgresql-pgbouncer:release init: true networks: - default @@ -1350,7 +1350,7 @@ services: # ----------------- # postgresql-server: - image: gcr.io/mcback/postgresql-server:release + image: mc2021/postgresql-server:release init: true networks: - default @@ -1379,7 +1379,7 @@ services: # ------------------------------------ # purge-object-caches: - image: gcr.io/mcback/purge-object-caches:release + image: mc2021/purge-object-caches:release init: true networks: - default @@ -1402,7 +1402,7 @@ services: # -------- # rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:release + image: mc2021/rabbitmq-server:release # Docker doesn't reap zombie processes properly # (https://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/) # and Erlang gets SIGCHLD signals from Docker for whatever reason @@ -1439,7 +1439,7 @@ services: # proxy to the webapp. # rabbitmq-server-webapp-proxy: - image: gcr.io/mcback/rabbitmq-server-webapp-proxy:release + image: mc2021/rabbitmq-server-webapp-proxy:release init: true networks: - default @@ -1466,7 +1466,7 @@ services: # ---------------- # rescrape-media: - image: gcr.io/mcback/rescrape-media:release + image: mc2021/rescrape-media:release init: true networks: - default @@ -1492,7 +1492,7 @@ services: # ------------------------------ # sitemap-fetch-media-pages: - image: gcr.io/mcback/sitemap-fetch-media-pages:release + image: mc2021/sitemap-fetch-media-pages:release init: true networks: - default @@ -1738,7 +1738,7 @@ services: # proxy to the webapp. # solr-shard-webapp-proxy: - image: gcr.io/mcback/solr-shard-webapp-proxy:release + image: mc2021/solr-shard-webapp-proxy:release init: true networks: - default @@ -1765,7 +1765,7 @@ services: # -------------- # solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:release + image: mc2021/solr-zookeeper:release init: true networks: - default @@ -1788,7 +1788,7 @@ services: # ------------------------------------------------ # temporal-elasticsearch: - image: gcr.io/mcback/temporal-elasticsearch:release + image: mc2021/temporal-elasticsearch:release init: true networks: - default @@ -1817,7 +1817,7 @@ services: # ---------------------------------------------- # temporal-grafana: - image: gcr.io/mcback/temporal-grafana:release + image: mc2021/temporal-grafana:release init: true networks: - default @@ -1847,7 +1847,7 @@ services: # ------------------------------------------------ # temporal-postgresql: - image: gcr.io/mcback/temporal-postgresql:release + image: mc2021/temporal-postgresql:release init: true networks: - default @@ -1875,7 +1875,7 @@ services: # ------------------------------------------------- # temporal-prometheus: - image: gcr.io/mcback/temporal-prometheus:release + image: mc2021/temporal-prometheus:release init: true depends_on: - temporal-grafana @@ -1903,7 +1903,7 @@ services: # -------------------------------------------- # temporal-server: - image: gcr.io/mcback/temporal-server:release + image: mc2021/temporal-server:release init: true networks: - default @@ -1942,7 +1942,7 @@ services: # ----------------------------------------- # temporal-webapp: - image: gcr.io/mcback/temporal-webapp:release + image: mc2021/temporal-webapp:release init: true networks: - default @@ -1969,7 +1969,7 @@ services: # ------------------------------- # topics-extract-story-links: - image: gcr.io/mcback/topics-extract-story-links:release + image: mc2021/topics-extract-story-links:release init: true networks: - default @@ -1994,7 +1994,7 @@ services: # ---------------------- # topics-fetch-link: - image: gcr.io/mcback/topics-fetch-link:release + image: mc2021/topics-fetch-link:release init: true networks: - default @@ -2019,7 +2019,7 @@ services: # ------------------ # topics-fetch-twitter-urls: - image: gcr.io/mcback/topics-fetch-twitter-urls:release + image: mc2021/topics-fetch-twitter-urls:release init: true networks: - default @@ -2043,7 +2043,7 @@ services: # ------------------------- # topics-map: - image: gcr.io/mcback/topics-map:release + image: mc2021/topics-map:release init: true networks: - default @@ -2066,7 +2066,7 @@ services: # ------------ # topics-mine: - image: gcr.io/mcback/topics-mine:release + image: mc2021/topics-mine:release init: true networks: - default @@ -2092,7 +2092,7 @@ services: # ------------------- # topics-mine-public: - image: gcr.io/mcback/topics-mine-public:release + image: mc2021/topics-mine-public:release init: true networks: - default @@ -2118,7 +2118,7 @@ services: # ---------------- # topics-snapshot: - image: gcr.io/mcback/topics-snapshot:release + image: mc2021/topics-snapshot:release init: true networks: - default @@ -2143,7 +2143,7 @@ services: # -------------------------------- # webapp-api: - image: gcr.io/mcback/webapp-api:release + image: mc2021/webapp-api:release init: true networks: - default @@ -2169,7 +2169,7 @@ services: # -------------------- # webapp-httpd: - image: gcr.io/mcback/webapp-httpd:release + image: mc2021/webapp-httpd:release init: true networks: - default @@ -2199,7 +2199,7 @@ services: # ---------------- # word2vec-generate-snapshot-model: - image: gcr.io/mcback/word2vec-generate-snapshot-model:release + image: mc2021/word2vec-generate-snapshot-model:release init: true networks: - default diff --git a/apps/dump-table/.idea/runConfigurations/Dockerfile.xml b/apps/dump-table/.idea/runConfigurations/Dockerfile.xml index 45c54093b2..c3fe195423 100644 --- a/apps/dump-table/.idea/runConfigurations/Dockerfile.xml +++ b/apps/dump-table/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/dump-table/Dockerfile b/apps/dump-table/Dockerfile index f749813cc3..9a2a50cd0c 100644 --- a/apps/dump-table/Dockerfile +++ b/apps/dump-table/Dockerfile @@ -2,7 +2,7 @@ # Table dump script # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Install Perl dependencies COPY src/cpanfile /var/tmp/ diff --git a/apps/dump-table/docker-compose.tests.yml b/apps/dump-table/docker-compose.tests.yml index 7940757394..8197423de6 100644 --- a/apps/dump-table/docker-compose.tests.yml +++ b/apps/dump-table/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: dump-table: - image: gcr.io/mcback/dump-table:latest + image: mc2021/dump-table:latest init: true stop_signal: SIGKILL volumes: @@ -17,7 +17,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -30,7 +30,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/elasticsearch-base/Dockerfile b/apps/elasticsearch-base/Dockerfile index 07207b0d51..4f0a8b10d6 100644 --- a/apps/elasticsearch-base/Dockerfile +++ b/apps/elasticsearch-base/Dockerfile @@ -2,7 +2,7 @@ # Base image for Elasticsearch # -FROM gcr.io/mcback/java-base:latest +FROM mc2021/java-base:latest # Install Elasticsearch # (https://www.elastic.co/downloads/elasticsearch-no-jdk) diff --git a/apps/elk-elasticsearch/Dockerfile b/apps/elk-elasticsearch/Dockerfile index 754ccb43b6..a8676476ee 100644 --- a/apps/elk-elasticsearch/Dockerfile +++ b/apps/elk-elasticsearch/Dockerfile @@ -2,7 +2,7 @@ # Elasticsearch for ELK logging stack # -FROM gcr.io/mcback/elasticsearch-base:latest +FROM mc2021/elasticsearch-base:latest USER root diff --git a/apps/elk-filebeat/Dockerfile b/apps/elk-filebeat/Dockerfile index 40e0b866d9..c7c4e30d2f 100644 --- a/apps/elk-filebeat/Dockerfile +++ b/apps/elk-filebeat/Dockerfile @@ -2,7 +2,7 @@ # Filebeat for ELK file + container logging # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install Filebeat # (https://www.elastic.co/downloads/beats/filebeat) diff --git a/apps/elk-journalbeat/Dockerfile b/apps/elk-journalbeat/Dockerfile index f1128b7141..ad8f3e0ff6 100644 --- a/apps/elk-journalbeat/Dockerfile +++ b/apps/elk-journalbeat/Dockerfile @@ -2,7 +2,7 @@ # Journalbeat for ELK journald logging # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install systemd to get journalctl utility RUN apt-get -y --no-install-recommends install systemd diff --git a/apps/elk-kibana/Dockerfile b/apps/elk-kibana/Dockerfile index 5fe85e6571..e92cf993c3 100644 --- a/apps/elk-kibana/Dockerfile +++ b/apps/elk-kibana/Dockerfile @@ -2,7 +2,7 @@ # Kibana for ELK logging stack # -FROM gcr.io/mcback/java-base:latest +FROM mc2021/java-base:latest # Install headless Chromium dependencies (needed for Reporting) RUN \ diff --git a/apps/elk-kibana/docker-compose.tests.yml b/apps/elk-kibana/docker-compose.tests.yml index d98bca2078..a1aff3f52d 100644 --- a/apps/elk-kibana/docker-compose.tests.yml +++ b/apps/elk-kibana/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: elk-kibana: - image: gcr.io/mcback/elk-kibana:latest + image: mc2021/elk-kibana:latest init: true stop_signal: SIGKILL networks: @@ -21,7 +21,7 @@ services: - elk-elasticsearch elk-elasticsearch: - image: gcr.io/mcback/elk-elasticsearch:latest + image: mc2021/elk-elasticsearch:latest init: true stop_signal: SIGKILL environment: @@ -66,7 +66,7 @@ services: - elk-journalbeat elk-filebeat: - image: gcr.io/mcback/elk-filebeat:latest + image: mc2021/elk-filebeat:latest init: true stop_signal: SIGKILL networks: @@ -89,7 +89,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock elk-journalbeat: - image: gcr.io/mcback/elk-journalbeat:latest + image: mc2021/elk-journalbeat:latest init: true stop_signal: SIGKILL networks: diff --git a/apps/export-tables-to-backup-crawler/.idea/runConfigurations/Dockerfile.xml b/apps/export-tables-to-backup-crawler/.idea/runConfigurations/Dockerfile.xml index f6d84ed581..a45f3ce56d 100644 --- a/apps/export-tables-to-backup-crawler/.idea/runConfigurations/Dockerfile.xml +++ b/apps/export-tables-to-backup-crawler/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/export-tables-to-backup-crawler/Dockerfile b/apps/export-tables-to-backup-crawler/Dockerfile index 1917c6d29d..80ee9dff73 100644 --- a/apps/export-tables-to-backup-crawler/Dockerfile +++ b/apps/export-tables-to-backup-crawler/Dockerfile @@ -2,7 +2,7 @@ # Export tables to run backup crawler # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/export-tables-to-backup-crawler/ diff --git a/apps/export-tables-to-backup-crawler/docker-compose.tests.yml b/apps/export-tables-to-backup-crawler/docker-compose.tests.yml index bec36c4c46..de1074d203 100644 --- a/apps/export-tables-to-backup-crawler/docker-compose.tests.yml +++ b/apps/export-tables-to-backup-crawler/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: export-tables-to-backup-crawler: - image: gcr.io/mcback/export-tables-to-backup-crawler:latest + image: mc2021/export-tables-to-backup-crawler:latest init: true stop_signal: SIGKILL volumes: @@ -23,7 +23,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -36,7 +36,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/extract-and-vector/.idea/runConfigurations/Dockerfile.xml b/apps/extract-and-vector/.idea/runConfigurations/Dockerfile.xml index 307455c896..947df33a5b 100644 --- a/apps/extract-and-vector/.idea/runConfigurations/Dockerfile.xml +++ b/apps/extract-and-vector/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/extract-and-vector/Dockerfile b/apps/extract-and-vector/Dockerfile index c5333424fe..936f63bfbd 100644 --- a/apps/extract-and-vector/Dockerfile +++ b/apps/extract-and-vector/Dockerfile @@ -2,7 +2,7 @@ # Extract and vector stories # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/extract-and-vector/ diff --git a/apps/extract-and-vector/docker-compose.tests.yml b/apps/extract-and-vector/docker-compose.tests.yml index dc15a36094..e4c49ea3e2 100644 --- a/apps/extract-and-vector/docker-compose.tests.yml +++ b/apps/extract-and-vector/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: extract-and-vector: - image: gcr.io/mcback/extract-and-vector:latest + image: mc2021/extract-and-vector:latest init: true stop_signal: SIGKILL volumes: @@ -26,7 +26,7 @@ services: - rabbitmq-server extract-article-from-page: - image: gcr.io/mcback/extract-article-from-page:latest + image: mc2021/extract-article-from-page:latest init: true stop_signal: SIGKILL expose: @@ -43,7 +43,7 @@ services: target: /opt/mediacloud/src/common/ postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -56,7 +56,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -73,7 +73,7 @@ services: target: /etc/postgresql/13/main/ rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/extract-article-from-page/.idea/runConfigurations/Dockerfile.xml b/apps/extract-article-from-page/.idea/runConfigurations/Dockerfile.xml index c0ed28b0bb..dd6c09bdee 100644 --- a/apps/extract-article-from-page/.idea/runConfigurations/Dockerfile.xml +++ b/apps/extract-article-from-page/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/extract-article-from-page/Dockerfile b/apps/extract-article-from-page/Dockerfile index 77590b78de..23d8d4a0ce 100644 --- a/apps/extract-article-from-page/Dockerfile +++ b/apps/extract-article-from-page/Dockerfile @@ -4,7 +4,7 @@ # FIXME possibly add cache # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Install Python dependencies COPY src/requirements.txt /var/tmp/ diff --git a/apps/extract-article-from-page/docker-compose.tests.yml b/apps/extract-article-from-page/docker-compose.tests.yml index 32968eff29..a63846497c 100644 --- a/apps/extract-article-from-page/docker-compose.tests.yml +++ b/apps/extract-article-from-page/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: extract-article-from-page: - image: gcr.io/mcback/extract-article-from-page:latest + image: mc2021/extract-article-from-page:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/facebook-fetch-story-stats/.idea/runConfigurations/Dockerfile.xml b/apps/facebook-fetch-story-stats/.idea/runConfigurations/Dockerfile.xml index e4b2320cca..401dd724ae 100644 --- a/apps/facebook-fetch-story-stats/.idea/runConfigurations/Dockerfile.xml +++ b/apps/facebook-fetch-story-stats/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/facebook-fetch-story-stats/Dockerfile b/apps/facebook-fetch-story-stats/Dockerfile index dadcefd7fe..0d357f752e 100644 --- a/apps/facebook-fetch-story-stats/Dockerfile +++ b/apps/facebook-fetch-story-stats/Dockerfile @@ -2,7 +2,7 @@ # Fetch story stats from Facebook # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/facebook-fetch-story-stats/ diff --git a/apps/facebook-fetch-story-stats/docker-compose.tests.yml b/apps/facebook-fetch-story-stats/docker-compose.tests.yml index 917c869c08..8836bc5305 100644 --- a/apps/facebook-fetch-story-stats/docker-compose.tests.yml +++ b/apps/facebook-fetch-story-stats/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: facebook-fetch-story-stats: - image: gcr.io/mcback/facebook-fetch-story-stats:latest + image: mc2021/facebook-fetch-story-stats:latest init: true stop_signal: SIGKILL environment: @@ -27,7 +27,7 @@ services: - rabbitmq-server postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -40,7 +40,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -57,7 +57,7 @@ services: target: /etc/postgresql/13/main/ rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/import-solr-data-for-testing/.idea/perl5local.xml b/apps/import-solr-data-for-testing/.idea/perl5local.xml index 2c7bc5356d..4e90a6d1d7 100644 --- a/apps/import-solr-data-for-testing/.idea/perl5local.xml +++ b/apps/import-solr-data-for-testing/.idea/perl5local.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/apps/import-solr-data-for-testing/.idea/runConfigurations/Dockerfile.xml b/apps/import-solr-data-for-testing/.idea/runConfigurations/Dockerfile.xml index 25968de8f4..5e01fc3774 100644 --- a/apps/import-solr-data-for-testing/.idea/runConfigurations/Dockerfile.xml +++ b/apps/import-solr-data-for-testing/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/import-solr-data-for-testing/Dockerfile b/apps/import-solr-data-for-testing/Dockerfile index 18b9700c3b..76bc11515c 100644 --- a/apps/import-solr-data-for-testing/Dockerfile +++ b/apps/import-solr-data-for-testing/Dockerfile @@ -2,7 +2,7 @@ # Import stories from PostgreSQL to Solr for testing purposes # -FROM gcr.io/mcback/import-solr-data:latest +FROM mc2021/import-solr-data:latest USER root diff --git a/apps/import-solr-data-for-testing/docker-compose.tests.yml b/apps/import-solr-data-for-testing/docker-compose.tests.yml index 27fc041b8c..5f4b01eef3 100644 --- a/apps/import-solr-data-for-testing/docker-compose.tests.yml +++ b/apps/import-solr-data-for-testing/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: import-solr-data-for-testing: - image: gcr.io/mcback/import-solr-data-for-testing:latest + image: mc2021/import-solr-data-for-testing:latest init: true stop_signal: SIGKILL environment: @@ -24,7 +24,7 @@ services: - rabbitmq-server postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -37,7 +37,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -54,7 +54,7 @@ services: target: /etc/postgresql/13/main/ solr-shard-01: - image: gcr.io/mcback/solr-shard:latest + image: mc2021/solr-shard:latest init: true stop_signal: SIGKILL environment: @@ -72,7 +72,7 @@ services: - solr-zookeeper solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:latest + image: mc2021/solr-zookeeper:latest init: true stop_signal: SIGKILL expose: @@ -88,7 +88,7 @@ services: target: /zookeeper.sh rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/import-solr-data/.idea/perl5local.xml b/apps/import-solr-data/.idea/perl5local.xml index 13698db576..0790ed79dd 100644 --- a/apps/import-solr-data/.idea/perl5local.xml +++ b/apps/import-solr-data/.idea/perl5local.xml @@ -1,93 +1,93 @@ - diff --git a/apps/import-solr-data/.idea/runConfigurations/Dockerfile.xml b/apps/import-solr-data/.idea/runConfigurations/Dockerfile.xml index eb26bc9487..792c91b213 100644 --- a/apps/import-solr-data/.idea/runConfigurations/Dockerfile.xml +++ b/apps/import-solr-data/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/import-solr-data/Dockerfile b/apps/import-solr-data/Dockerfile index 42f0b89bbc..c75e72842c 100644 --- a/apps/import-solr-data/Dockerfile +++ b/apps/import-solr-data/Dockerfile @@ -2,7 +2,7 @@ # Import stories from PostgreSQL to Solr # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Install Perl dependencies COPY src/cpanfile /var/tmp/ diff --git a/apps/import-solr-data/docker-compose.tests.yml b/apps/import-solr-data/docker-compose.tests.yml index ebf9bfbd6d..a49ce49843 100644 --- a/apps/import-solr-data/docker-compose.tests.yml +++ b/apps/import-solr-data/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: import-solr-data: - image: gcr.io/mcback/import-solr-data:latest + image: mc2021/import-solr-data:latest init: true stop_signal: SIGKILL environment: @@ -29,7 +29,7 @@ services: - rabbitmq-server import-solr-data-for-testing: - image: gcr.io/mcback/import-solr-data-for-testing:latest + image: mc2021/import-solr-data-for-testing:latest init: true environment: MC_SOLR_IMPORT_MAX_QUEUED_STORIES: 100000 @@ -49,7 +49,7 @@ services: - solr-shard-01 postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -62,7 +62,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -79,7 +79,7 @@ services: target: /etc/postgresql/13/main/ solr-shard-01: - image: gcr.io/mcback/solr-shard:latest + image: mc2021/solr-shard:latest init: true stop_signal: SIGKILL environment: @@ -97,7 +97,7 @@ services: - solr-zookeeper solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:latest + image: mc2021/solr-zookeeper:latest init: true stop_signal: SIGKILL expose: @@ -113,7 +113,7 @@ services: target: /zookeeper.sh rabbitmq-server: - image: gcr.io/mcback/rabbitmq-server:latest + image: mc2021/rabbitmq-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/import-stories-base/Dockerfile b/apps/import-stories-base/Dockerfile index 0e7549e71a..8879521eef 100644 --- a/apps/import-stories-base/Dockerfile +++ b/apps/import-stories-base/Dockerfile @@ -2,7 +2,7 @@ # Base image for code that imports stories from arbitrary sources # -FROM gcr.io/mcback/extract-and-vector:latest +FROM mc2021/extract-and-vector:latest USER root diff --git a/apps/import-stories-base/docker-compose.tests.yml b/apps/import-stories-base/docker-compose.tests.yml index df54bc47d0..7036a4ea7d 100644 --- a/apps/import-stories-base/docker-compose.tests.yml +++ b/apps/import-stories-base/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: import-stories-base: - image: gcr.io/mcback/import-stories-base:latest + image: mc2021/import-stories-base:latest init: true stop_signal: SIGKILL volumes: diff --git a/apps/import-stories-feedly/.idea/runConfigurations/Dockerfile.xml b/apps/import-stories-feedly/.idea/runConfigurations/Dockerfile.xml index fb62c0a76d..15af75f094 100644 --- a/apps/import-stories-feedly/.idea/runConfigurations/Dockerfile.xml +++ b/apps/import-stories-feedly/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/import-stories-feedly/Dockerfile b/apps/import-stories-feedly/Dockerfile index 60b8826c44..33b21ce9e3 100644 --- a/apps/import-stories-feedly/Dockerfile +++ b/apps/import-stories-feedly/Dockerfile @@ -2,7 +2,7 @@ # Import stories by fetching them from Feedly # -FROM gcr.io/mcback/import-stories-base:latest +FROM mc2021/import-stories-base:latest # Install Perl dependencies COPY src/cpanfile /var/tmp/ diff --git a/apps/import-stories-feedly/docker-compose.tests.yml b/apps/import-stories-feedly/docker-compose.tests.yml index dfc441ac98..a748adda66 100644 --- a/apps/import-stories-feedly/docker-compose.tests.yml +++ b/apps/import-stories-feedly/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: import-stories-feedly: - image: gcr.io/mcback/import-stories-feedly:latest + image: mc2021/import-stories-feedly:latest init: true stop_signal: SIGKILL volumes: @@ -26,7 +26,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -39,7 +39,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/import-stories-scrapehtml/.idea/runConfigurations/Dockerfile.xml b/apps/import-stories-scrapehtml/.idea/runConfigurations/Dockerfile.xml index c561fd2c45..b0a91fa14c 100644 --- a/apps/import-stories-scrapehtml/.idea/runConfigurations/Dockerfile.xml +++ b/apps/import-stories-scrapehtml/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/import-stories-scrapehtml/Dockerfile b/apps/import-stories-scrapehtml/Dockerfile index 48e8608c9a..f22dc87497 100644 --- a/apps/import-stories-scrapehtml/Dockerfile +++ b/apps/import-stories-scrapehtml/Dockerfile @@ -2,7 +2,7 @@ # Import stories by scraping HTML # -FROM gcr.io/mcback/import-stories-base:latest +FROM mc2021/import-stories-base:latest # Install Perl dependencies COPY src/cpanfile /var/tmp/ diff --git a/apps/import-stories-scrapehtml/docker-compose.tests.yml b/apps/import-stories-scrapehtml/docker-compose.tests.yml index f48a47cda7..9e2024e09a 100644 --- a/apps/import-stories-scrapehtml/docker-compose.tests.yml +++ b/apps/import-stories-scrapehtml/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: import-stories-scrapehtml: - image: gcr.io/mcback/import-stories-scrapehtml:latest + image: mc2021/import-stories-scrapehtml:latest init: true stop_signal: SIGKILL volumes: @@ -26,7 +26,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -39,7 +39,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/java-base/Dockerfile b/apps/java-base/Dockerfile index a3b3026577..9cdde91fe6 100644 --- a/apps/java-base/Dockerfile +++ b/apps/java-base/Dockerfile @@ -2,7 +2,7 @@ # Base image for apps that use Java # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest ENV JAVA_HOME=/usr/lib/jvm/java-15-openjdk-amd64/ diff --git a/apps/mail-opendkim-server/Dockerfile b/apps/mail-opendkim-server/Dockerfile index 8f1f8f2f5c..20678a7eb7 100644 --- a/apps/mail-opendkim-server/Dockerfile +++ b/apps/mail-opendkim-server/Dockerfile @@ -2,7 +2,7 @@ # OpenDKIM server # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install packages RUN \ diff --git a/apps/mail-postfix-server/Dockerfile b/apps/mail-postfix-server/Dockerfile index 039bf1b029..57696d81b0 100644 --- a/apps/mail-postfix-server/Dockerfile +++ b/apps/mail-postfix-server/Dockerfile @@ -2,7 +2,7 @@ # Postfix server # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install packages RUN \ diff --git a/apps/mail-postfix-server/docker-compose.tests.yml b/apps/mail-postfix-server/docker-compose.tests.yml index 1c51ca0677..3909b45c4d 100644 --- a/apps/mail-postfix-server/docker-compose.tests.yml +++ b/apps/mail-postfix-server/docker-compose.tests.yml @@ -27,7 +27,7 @@ services: # 13) >> send_email(test_message) # mail-postfix-server: - image: gcr.io/mcback/common:latest + image: mc2021/common:latest init: true stop_signal: SIGKILL volumes: @@ -39,7 +39,7 @@ services: # Actual mail server, operating under "mail-postfix-server" alias mail-postfix-server-actual: - image: gcr.io/mcback/mail-postfix-server:latest + image: mc2021/mail-postfix-server:latest init: true stop_signal: SIGKILL # "docker exec" into a container and run Postfix manually (./postfix.sh): @@ -56,7 +56,7 @@ services: - mail-postfix-server mail-opendkim-server: - image: gcr.io/mcback/mail-opendkim-server:latest + image: mc2021/mail-opendkim-server:latest init: true environment: MC_MAIL_OPENDKIM_DOMAIN: "testmediacloud.ml" diff --git a/apps/mirror-cpan-on-s3/Dockerfile b/apps/mirror-cpan-on-s3/Dockerfile index d9a54d03e0..b71c7fd23d 100644 --- a/apps/mirror-cpan-on-s3/Dockerfile +++ b/apps/mirror-cpan-on-s3/Dockerfile @@ -2,7 +2,7 @@ # Script to mirror CPAN to S3 for easier Perl dependencies installing # -FROM gcr.io/mcback/perl-python-base:latest +FROM mc2021/perl-python-base:latest # Install dependencies RUN \ diff --git a/apps/munin-cron/Dockerfile b/apps/munin-cron/Dockerfile index ab512c923f..827acea802 100644 --- a/apps/munin-cron/Dockerfile +++ b/apps/munin-cron/Dockerfile @@ -2,7 +2,7 @@ # Munin Cron stats collector # -FROM gcr.io/mcback/cron-base:latest +FROM mc2021/cron-base:latest # FIXME RUN apt-get -y update diff --git a/apps/munin-cron/docker-compose.tests.yml b/apps/munin-cron/docker-compose.tests.yml index 055e88673f..9293c7e190 100644 --- a/apps/munin-cron/docker-compose.tests.yml +++ b/apps/munin-cron/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: munin-cron: - image: gcr.io/mcback/munin-cron:latest + image: mc2021/munin-cron:latest init: true stop_signal: SIGKILL environment: @@ -23,7 +23,7 @@ services: - munin-node munin-node: - image: gcr.io/mcback/munin-node:latest + image: mc2021/munin-node:latest init: true stop_signal: SIGKILL volumes: @@ -37,7 +37,7 @@ services: - solr-shard-01 postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -50,7 +50,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -67,7 +67,7 @@ services: target: /etc/postgresql/13/main/ solr-shard-01: - image: gcr.io/mcback/solr-shard:latest + image: mc2021/solr-shard:latest init: true stop_signal: SIGKILL environment: @@ -85,7 +85,7 @@ services: - solr-zookeeper solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:latest + image: mc2021/solr-zookeeper:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/munin-fastcgi-graph/Dockerfile b/apps/munin-fastcgi-graph/Dockerfile index 5cbb37ff96..a3818fa7e3 100644 --- a/apps/munin-fastcgi-graph/Dockerfile +++ b/apps/munin-fastcgi-graph/Dockerfile @@ -2,7 +2,7 @@ # Munin FastCGI graph generator # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install packages RUN \ diff --git a/apps/munin-httpd/Dockerfile b/apps/munin-httpd/Dockerfile index feb9c2f101..7b4eced553 100644 --- a/apps/munin-httpd/Dockerfile +++ b/apps/munin-httpd/Dockerfile @@ -2,7 +2,7 @@ # Munin HTTP server # -FROM gcr.io/mcback/nginx-base:latest +FROM mc2021/nginx-base:latest # Install Munin's static web files, e.g. CSS stylesheets RUN apt-get -y --no-install-recommends install munin diff --git a/apps/munin-httpd/docker-compose.tests.yml b/apps/munin-httpd/docker-compose.tests.yml index 0c8403be69..9be877adcd 100644 --- a/apps/munin-httpd/docker-compose.tests.yml +++ b/apps/munin-httpd/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: munin-httpd: - image: gcr.io/mcback/munin-httpd:latest + image: mc2021/munin-httpd:latest init: true stop_signal: SIGKILL ports: @@ -23,7 +23,7 @@ services: - munin-cron munin-fastcgi-graph: - image: gcr.io/mcback/munin-fastcgi-graph:latest + image: mc2021/munin-fastcgi-graph:latest init: true stop_signal: SIGKILL expose: @@ -33,7 +33,7 @@ services: - vol_munin_data:/var/lib/munin/ munin-cron: - image: gcr.io/mcback/munin-cron:latest + image: mc2021/munin-cron:latest init: true stop_signal: SIGKILL environment: @@ -50,7 +50,7 @@ services: - munin-node munin-node: - image: gcr.io/mcback/munin-node:latest + image: mc2021/munin-node:latest init: true stop_signal: SIGKILL volumes: @@ -64,7 +64,7 @@ services: - solr-shard-01 postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -77,7 +77,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -94,7 +94,7 @@ services: target: /etc/postgresql/13/main/ solr-shard-01: - image: gcr.io/mcback/solr-shard:latest + image: mc2021/solr-shard:latest init: true stop_signal: SIGKILL environment: @@ -112,7 +112,7 @@ services: - solr-zookeeper solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:latest + image: mc2021/solr-zookeeper:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/munin-node/Dockerfile b/apps/munin-node/Dockerfile index 233d140918..fb03858738 100644 --- a/apps/munin-node/Dockerfile +++ b/apps/munin-node/Dockerfile @@ -2,7 +2,7 @@ # Munin node # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install packages RUN \ diff --git a/apps/munin-node/docker-compose.tests.yml b/apps/munin-node/docker-compose.tests.yml index d9bdc527e2..554fb42313 100644 --- a/apps/munin-node/docker-compose.tests.yml +++ b/apps/munin-node/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: munin-node: - image: gcr.io/mcback/munin-node:latest + image: mc2021/munin-node:latest init: true stop_signal: SIGKILL volumes: @@ -17,7 +17,7 @@ services: - solr-shard-01 postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -30,7 +30,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: @@ -47,7 +47,7 @@ services: target: /etc/postgresql/13/main/ solr-shard-01: - image: gcr.io/mcback/solr-shard:latest + image: mc2021/solr-shard:latest init: true stop_signal: SIGKILL environment: @@ -65,7 +65,7 @@ services: - solr-zookeeper solr-zookeeper: - image: gcr.io/mcback/solr-zookeeper:latest + image: mc2021/solr-zookeeper:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/nginx-base/Dockerfile b/apps/nginx-base/Dockerfile index 134e8cc5c0..8eb9fdb0d1 100644 --- a/apps/nginx-base/Dockerfile +++ b/apps/nginx-base/Dockerfile @@ -2,7 +2,7 @@ # Base image for Nginx # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install packages RUN \ diff --git a/apps/nytlabels-annotator-webapp-proxy/Dockerfile b/apps/nytlabels-annotator-webapp-proxy/Dockerfile index 66f9dfd912..ef5e4501f2 100644 --- a/apps/nytlabels-annotator-webapp-proxy/Dockerfile +++ b/apps/nytlabels-annotator-webapp-proxy/Dockerfile @@ -2,7 +2,7 @@ # Proxy to NYTLabels annotator, roundrobins between nytlabels-annotator instances # -FROM gcr.io/mcback/nginx-base:latest +FROM mc2021/nginx-base:latest # Copy configuration COPY nginx/include/nytlabels-annotator-webapp-proxy.conf /etc/nginx/include/ diff --git a/apps/nytlabels-annotator/.idea/misc.xml b/apps/nytlabels-annotator/.idea/misc.xml index dd2f82cf96..e7f2d065a7 100644 --- a/apps/nytlabels-annotator/.idea/misc.xml +++ b/apps/nytlabels-annotator/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/apps/nytlabels-annotator/.idea/nytlabels-annotator.iml b/apps/nytlabels-annotator/.idea/nytlabels-annotator.iml index 3e3e8c191c..2a99f8260a 100644 --- a/apps/nytlabels-annotator/.idea/nytlabels-annotator.iml +++ b/apps/nytlabels-annotator/.idea/nytlabels-annotator.iml @@ -2,7 +2,7 @@ - + diff --git a/apps/nytlabels-annotator/.idea/runConfigurations/Dockerfile.xml b/apps/nytlabels-annotator/.idea/runConfigurations/Dockerfile.xml index d26ea359ae..4307ae6167 100644 --- a/apps/nytlabels-annotator/.idea/runConfigurations/Dockerfile.xml +++ b/apps/nytlabels-annotator/.idea/runConfigurations/Dockerfile.xml @@ -2,12 +2,12 @@ - diff --git a/apps/nytlabels-annotator/Dockerfile b/apps/nytlabels-annotator/Dockerfile index 0d33d8845b..463ad9ed84 100644 --- a/apps/nytlabels-annotator/Dockerfile +++ b/apps/nytlabels-annotator/Dockerfile @@ -2,7 +2,7 @@ # NYT-based news tagger service # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest RUN \ # FIXME remove once the base image gets updated diff --git a/apps/nytlabels-annotator/README.md b/apps/nytlabels-annotator/README.md index f20423ebe3..c9813f70ea 100644 --- a/apps/nytlabels-annotator/README.md +++ b/apps/nytlabels-annotator/README.md @@ -8,7 +8,7 @@ Requires at least 1 GB of RAM. Start the annotator: ```bash -docker run -it -p 8080:8080 gcr.io/mcback/nytlabels-annotator:latest +docker run -it -p 8080:8080 mc2021/nytlabels-annotator:latest ``` create a file with text to annotate: diff --git a/apps/nytlabels-fetch-annotation-and-tag/Dockerfile b/apps/nytlabels-fetch-annotation-and-tag/Dockerfile index bf138bf9cb..4fb2129fe2 100644 --- a/apps/nytlabels-fetch-annotation-and-tag/Dockerfile +++ b/apps/nytlabels-fetch-annotation-and-tag/Dockerfile @@ -2,7 +2,7 @@ # NYTLabels fetch annotation + tag worker # -FROM gcr.io/mcback/common:latest +FROM mc2021/common:latest # Copy sources COPY src/ /opt/mediacloud/src/nytlabels-fetch-annotation-and-tag/ diff --git a/apps/nytlabels-fetch-annotation-and-tag/docker-compose.tests.yml b/apps/nytlabels-fetch-annotation-and-tag/docker-compose.tests.yml index 785e7aacb4..0b73a8ebe0 100644 --- a/apps/nytlabels-fetch-annotation-and-tag/docker-compose.tests.yml +++ b/apps/nytlabels-fetch-annotation-and-tag/docker-compose.tests.yml @@ -3,7 +3,7 @@ version: "3.7" services: nytlabels-fetch-annotation-and-tag: - image: gcr.io/mcback/nytlabels-fetch-annotation-and-tag:latest + image: mc2021/nytlabels-fetch-annotation-and-tag:latest init: true stop_signal: SIGKILL environment: @@ -26,7 +26,7 @@ services: - postgresql-pgbouncer postgresql-pgbouncer: - image: gcr.io/mcback/postgresql-pgbouncer:latest + image: mc2021/postgresql-pgbouncer:latest init: true stop_signal: SIGKILL expose: @@ -39,7 +39,7 @@ services: - postgresql-server postgresql-server: - image: gcr.io/mcback/postgresql-server:latest + image: mc2021/postgresql-server:latest init: true stop_signal: SIGKILL expose: diff --git a/apps/perl-python-base/Dockerfile b/apps/perl-python-base/Dockerfile index aa8e8a6b10..bf2270324f 100644 --- a/apps/perl-python-base/Dockerfile +++ b/apps/perl-python-base/Dockerfile @@ -2,7 +2,7 @@ # Perl-Python code base # -FROM gcr.io/mcback/base:latest +FROM mc2021/base:latest # Install Python RUN \ diff --git a/apps/podcast-transcribe-episode/.idea/runConfigurations/Dockerfile.xml b/apps/podcast-transcribe-episode/.idea/runConfigurations/Dockerfile.xml index 85f79e0693..2af640f0bd 100644 --- a/apps/podcast-transcribe-episode/.idea/runConfigurations/Dockerfile.xml +++ b/apps/podcast-transcribe-episode/.idea/runConfigurations/Dockerfile.xml @@ -2,8 +2,8 @@ -