Use mozmeao dockerhub repo.

See https://github.com/mozmeao/infra/issues/1284

.gitlab-ci.yml

@@ -20,11 +20,11 @@ build:
     - aws
   script:
     - make clean build-ci
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock_test docker/bin/push2dockerhub.sh
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock_assets docker/bin/push2dockerhub.sh
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock_code docker/bin/push2dockerhub.sh
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock_build docker/bin/push2dockerhub.sh
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock_test docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock_assets docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock_code docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock_build docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock docker/bin/push2dockerhub.sh
     - bin/upload-staticfiles.sh
   retry: 2
 
@@ -37,8 +37,8 @@ build-test:
     - aws
   script:
     - make clean build-ci
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock_test docker/bin/push2dockerhub.sh
-    - FROM_DOCKER_REPOSITORY=mozorg/bedrock docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock_test docker/bin/push2dockerhub.sh
+    - FROM_DOCKER_REPOSITORY=mozmeao/bedrock docker/bin/push2dockerhub.sh
   retry: 2
 
 update-l10n:

bin/process-ftl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -exo pipefail
 
-DOCKER_IMAGE=mozorg/bedrock:latest
+DOCKER_IMAGE=mozmeao/bedrock:latest
 
 docker pull "$DOCKER_IMAGE"
 docker run --rm \

bin/update_config.sh

@@ -19,8 +19,8 @@ for CLUSTER in ${CLUSTERS:=iowa-a}; do
     done
 done
 
-TEST_IMAGE=mozorg/bedrock_test:${GIT_COMMIT}
-sed -i -e "s|TEST_IMAGE: .*|TEST_IMAGE: ${TEST_IMAGE}|;s|image: mozorg/bedrock_test.*|image: ${TEST_IMAGE}|" .gitlab-ci.yml
+TEST_IMAGE=mozmeao/bedrock_test:${GIT_COMMIT}
+sed -i -e "s|TEST_IMAGE: .*|TEST_IMAGE: ${TEST_IMAGE}|;s|image: mozmeao/bedrock_test.*|image: ${TEST_IMAGE}|" .gitlab-ci.yml
 git add .gitlab-ci.yml
 
 git commit -m "set image to ${DEPLOYMENT_DOCKER_IMAGE} in ${CLUSTERS}" || echo "nothing new to commit"

docker-compose.yml

@@ -9,7 +9,7 @@ services:
     build:
       context: .
       target: assets
-    image: mozorg/bedrock_assets:${GIT_COMMIT:-latest}
+    image: mozmeao/bedrock_assets:${GIT_COMMIT:-latest}
     command: gulp
     ports:
       - "8000-8010:8000-8010"
@@ -25,7 +25,7 @@ services:
     build:
       context: .
       target: devapp
-    image: mozorg/bedrock_test:${GIT_COMMIT:-latest}
+    image: mozmeao/bedrock_test:${GIT_COMMIT:-latest}
     command: python manage.py runserver 0.0.0.0:8080
     env_file: .env
     ports:
@@ -48,7 +48,7 @@ services:
 
   # run the tests against local changes
   test:
-    image: mozorg/bedrock_test:${GIT_COMMIT:-latest}
+    image: mozmeao/bedrock_test:${GIT_COMMIT:-latest}
     env_file: docker/envfiles/test.env
     volumes:
       - ./bedrock/:/app/bedrock:delegated
@@ -67,7 +67,7 @@ services:
 
   # run tests with no volumes
   test-image:
-    image: mozorg/bedrock_test:${GIT_COMMIT:-latest}
+    image: mozmeao/bedrock_test:${GIT_COMMIT:-latest}
     env_file: docker/envfiles/test.env
 
   # the django app
@@ -78,10 +78,10 @@ services:
       args:
         GIT_SHA: ${GIT_COMMIT:-latest}
         BRANCH_NAME: ${BRANCH_NAME:-latest}
-    image: mozorg/bedrock:${BRANCH_AND_COMMIT:-latest}
+    image: mozmeao/bedrock:${BRANCH_AND_COMMIT:-latest}
 
   release-local:
-    image: mozorg/bedrock:${BRANCH_AND_COMMIT:-latest}
+    image: mozmeao/bedrock:${BRANCH_AND_COMMIT:-latest}
     env_file: .env
     ports:
       - "8000:8000"
@@ -103,10 +103,10 @@ services:
     build:
       context: .
       target: python-builder
-    image: mozorg/bedrock_build:${GIT_COMMIT:-latest}
+    image: mozmeao/bedrock_build:${GIT_COMMIT:-latest}
 
   app-base:
     build:
       context: .
       target: app-base
-    image: mozorg/bedrock_code:${GIT_COMMIT:-latest}
+    image: mozmeao/bedrock_code:${GIT_COMMIT:-latest}

docker/bin/push2dockerhub.sh

@@ -10,7 +10,7 @@ set -exo pipefail
 BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $BIN_DIR/set_git_env_vars.sh
 
-if [[ "$FROM_DOCKER_REPOSITORY" == "mozorg/bedrock" ]]; then
+if [[ "$FROM_DOCKER_REPOSITORY" == "mozmeao/bedrock" ]]; then
     DOCKER_TAG="${BRANCH_AND_COMMIT}"
 else
     DOCKER_TAG="${GIT_COMMIT}"

docker/bin/run_integration_tests.sh

@@ -82,4 +82,4 @@ docker run --rm -v "${RESULTS_DIR}:${DOCKER_RESULTS_DIR}" -u $(stat -c "%u:%g" "
   -e "RESULTS_PATH=${DOCKER_RESULTS_DIR}" \
   -e "PYTEST_PROCESSES=5" \
   -e "PRIVACY=public restricted" \
-  mozorg/bedrock_test:${GIT_COMMIT} bin/run-integration-tests.sh
+  mozmeao/bedrock_test:${GIT_COMMIT} bin/run-integration-tests.sh

docker/bin/set_git_env_vars.sh

@@ -22,5 +22,5 @@ fi
 export BRANCH_NAME_SAFE="${BRANCH_NAME/\//-}"
 export BRANCH_AND_COMMIT="${BRANCH_NAME_SAFE}-${GIT_COMMIT}"
 # Docker Hub Stuff
-export DEPLOYMENT_DOCKER_REPO="mozorg/bedrock"
+export DEPLOYMENT_DOCKER_REPO="mozmeao/bedrock"
 export DEPLOYMENT_DOCKER_IMAGE="${DEPLOYMENT_DOCKER_REPO}:${BRANCH_AND_COMMIT}"

docs/pipeline.rst

@@ -159,5 +159,5 @@ that you'll be doing this so that we don't get conflicts.
 .. _enhancement request: https://issues.jenkins-ci.org/browse/JENKINS-26210
 .. _bug for the IRC plugin: https://issues.jenkins-ci.org/browse/JENKINS-28175
 .. _public staging environment: https://www.allizom.org
-.. _Docker Hub: https://hub.docker.com/r/mozorg/bedrock/tags
+.. _Docker Hub: https://hub.docker.com/r/mozmeao/bedrock/tags
 .. _production: https://www.mozilla.org