From 860d8f1ca191584b291a09164aec4d3a4b9b7410 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 19 Apr 2022 18:30:14 -0600
Subject: [PATCH] ci: Rename docker env var, specify optimism context

---
 .circleci/config.yml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d56f3dc8a8dbe..3fba8e409d362 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -302,7 +302,7 @@ jobs:
       - run:
           name: Publish
           command: |
-            echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+            echo "$DOCKER_PASS" | docker login -u "$DOCKER_USERNAME" --password-stdin
             docker push <<parameters.docker_tags>>
 
 workflows:
@@ -381,77 +381,107 @@ workflows:
           docker_file: ops/docker/Dockerfile.geth
           docker_tags: ethereumoptimism/l2geth:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: gas-oracle-release
           docker_file: ops/docker/Dockerfile.gas-oracle
           docker_tags: ethereumoptimism/gas-oracle:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: hardhat-node-release
           docker_file: ops/docker/hardhat/Dockerfile
           docker_tags: ethereumoptimism/hardhat-node:nightly
           docker_context: ops/docker/hardhat
+          context:
+            - optimism
       - docker-publish:
           name: go-builder-release
           docker_file: ops/docker/go-builder/Dockerfile
           docker_tags: ethereumoptimism/go-builder:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: js-builder-release
           docker_file: ops/docker/js-builder/Dockerfile
           docker_tags: ethereumoptimism/js-builder:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: proxyd-release
           docker_file: go/proxyd/Dockerfile
           docker_tags: ethereumoptimism/proxyd:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: l2geth-exporter-release
           docker_file: ops/docker/Dockerfile.l2geth-exporter
           docker_tags: ethereumoptimism/l2geth-exporter:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: op-exporter-release
           docker_file: ops/docker/Dockerfile.op-exporter
           docker_tags: ethereumoptimism/op-exporter:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: message-relayer-release
           docker_file: ops/docker/Dockerfile.packages
           docker_tags: ethereumoptimism/message-relayer:nightly
           docker_context: .
           target: message-relayer
+          context:
+            - optimism
       - docker-publish:
           name: data-transport-layer-release
           docker_file: ops/docker/Dockerfile.packages
           docker_tags: ethereumoptimism/data-transport-layer:nightly
           docker_context: .
           target: data-transport-layer
+          context:
+            - optimism
       - docker-publish:
           name: deployer-release
           docker_file: ops/docker/Dockerfile.packages
           docker_tags: ethereumoptimism/deployer:nightly
           docker_context: .
           target: integration-tests
+          context:
+            - optimism
       - docker-publish:
           name: replica-healthcheck-release
           docker_file: ops/docker/Dockerfile.packages
           docker_tags: ethereumoptimism/replica-healthcheck:nightly
           docker_context: .
           target: replica-healthcheck
+          context:
+            - optimism
       - docker-publish:
           name: batch-submitter-service-release
           docker_file: ops/docker/Dockerfile.batch-submitter-service
           docker_tags: ethereumoptimism/batch-submitter-service:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: indexer-release
           docker_file: ops/docker/Dockerfile.indexer
           docker_tags: ethereumoptimism/indexer:nightly
           docker_context: .
+          context:
+            - optimism
       - docker-publish:
           name: teleportr-release
           docker_file: ops/docker/Dockerfile.teleportr
           docker_tags: ethereumoptimism/teleportr:nightly
           docker_context: .
+          context:
+            - optimism