Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Move to docker hub from gcr #797

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Move to docker hub from gcr #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d682317
move to docker hub from gcr
jtotoole Jul 10, 2021
89c92e1
add --with-registry-auth to docker stack deploy examples
jtotoole Jul 19, 2021
eac323f
merge master
jtotoole Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
jtotoole marked this conversation as resolved.
Show resolved Hide resolved

- name: Pull images
# Don't stop on a single failure because the image might not exist or a
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/cliff-annotator-webapp-proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion apps/cliff-annotator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
#
Expand Down
2 changes: 1 addition & 1 deletion apps/cliff-fetch-annotation-and-tag/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions apps/cliff-fetch-annotation-and-tag/docker-compose.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions apps/common/.idea/runConfigurations/Dockerfile.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/common/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
16 changes: 8 additions & 8 deletions apps/common/docker-compose.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions apps/crawler-ap/.idea/runConfigurations/Dockerfile.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/crawler-ap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
12 changes: 6 additions & 6 deletions apps/crawler-ap/docker-compose.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions apps/crawler-fetcher/.idea/runConfigurations/Dockerfile.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/crawler-fetcher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
8 changes: 4 additions & 4 deletions apps/crawler-fetcher/docker-compose.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions apps/crawler-provider/.idea/runConfigurations/Dockerfile.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/crawler-provider/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions apps/crawler-provider/docker-compose.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions apps/create-missing-partitions/.idea/runConfigurations/Dockerfile.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/create-missing-partitions/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Create missing PostgreSQL table partitions
#

FROM gcr.io/mcback/common:latest
FROM mc2021/common:latest

COPY bin /opt/mediacloud/bin

Expand Down
Loading