use icr instead of dockerhub

Doug Davis · Doug Davis · commit bde42e66a49f · 2022-01-13T13:59:37.000Z
Signed-off-by: Doug Davis &lt;dug@us.ibm.com&gt;
diff --git a/README.md b/README.md
@@ -197,8 +197,8 @@ and used by anyone. Unless otherwise noted the overall pattern that will be
 followed is:
 
 - a `build` script shows how each container image used in the sample is built.
-  By default, the script will push the image to the `ibmcom` namespace on
-  DockerHub, so to use this yourself you'll need to set the `REGISTRY`
+  By default, the script will push the image to the `icr.io/codeengine`
+  namespace, so to use this yourself you'll need to set the `REGISTRY`
   environment variable to your own registry and/or namespace. Also, you
   MUST use a registry that allows for anonymous/public downloads of your
   images, since as of now (to keep the scripts simple) they do not deal
@@ -209,10 +209,11 @@ followed is:
 	to your secret that includes the registry credentials.
 - a `run` script will execute the sample. Most will also include logic to
   verify the output to ensure everything is working as expected. As with
-  `build`, it will default to using the `ibmcom` container images, so to use
-  your own you'll need to set the `REGISTRY` environment variable.
+  `build`, it will default to using the `icr.io/codeengine` container images,
+  so to use your own you'll need to set the `REGISTRY` environment variable.
   This means that you should be able to just execute `run` without running
-  `build` first, and it'll just use the pre-built images from `ibmcom`.
+  `build` first, and it'll just use the pre-built images from
+  `icr.io/codeengine`.
   - invoking `run clean` should clean up from any previous execution without
     re-running the sample.
 
diff --git a/app-n-job/build b/app-n-job/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/app-n-job .
diff --git a/app-n-job/run b/app-n-job/run
@@ -19,7 +19,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export NUM=${NUM:-10}
 
 # First create an app based on our image
diff --git a/app2job/build b/app2job/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
 docker build ${NOCACHE} -t ${REGISTRY}/a2j-app -f Dockerfile.app .
diff --git a/app2job/run b/app2job/run
@@ -19,7 +19,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export COUNT=${COUNT:-50}
 
 # Create the app
diff --git a/auth/build b/auth/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the images
 docker build ${NOCACHE} -f Dockerfile.nginx -t ${REGISTRY}/auth-proxy .
diff --git a/auth/run b/auth/run
@@ -15,7 +15,7 @@ clean
 
 set -ex
 
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create our business logic app - don't expose it on the internet
 ibmcloud ce app create -n auth-app --image $REGISTRY/auth-app --cluster-local
diff --git a/bash/build b/bash/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/ce-bash .
diff --git a/bash/run b/bash/run
@@ -21,7 +21,7 @@ function clean() {
 clean
 [[ "$1" == "clean" ]] && exit 0
 
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 set -ex
 
diff --git a/bin/DEVELOPMENT.md b/bin/DEVELOPMENT.md
@@ -12,9 +12,7 @@ General rules to follow:
   previous (successful or unsuccessful) execution, and then exit.
 - the `run` script needs to run it's "clean" logic before and after the
   normal activities.
-- all pre-built images should be stored in `ibmcom` on DockerHub. See
-  https://github.ibm.com/open-source/ibmcom/issues for adding new images.
-  Team: `coligo`.
+- all pre-built images should be stored in `icr.io/codeengine`.
 - all material must be listed on the top-level README.
 - preferred language is Go.
 - before submitting a PR make sure `bin/run-all-parallel` works every time.
diff --git a/bin/Dockerfile.tester b/bin/Dockerfile.tester
@@ -1,4 +1,4 @@
-FROM ibmcom/ce-bash
+FROM icr.io/codeengine/ce-bash
 
 COPY tester /
 CMD /tester
diff --git a/bin/run-tutorial b/bin/run-tutorial
@@ -29,8 +29,8 @@ while read -u 3 line ; do
   # Skip all non-user-commands and comment-commands
   [[ "$line" != "\$"* && "$line" != "<!-- "* ]] && continue
 
-  # Override the "ibmcom" if a REGISTRY was specified
-  [[ -n $REGISTRY ]] && line=${line/ibmcom/$REGISTRY}
+  # Override the "icr.io/codeengine" if a REGISTRY was specified
+  [[ -n $REGISTRY ]] && line=${line/icr.io\/codeengine/$REGISTRY}
 
   if [[ "$line" == "<!-- "* ]]; then
     # Comment command
diff --git a/bin/tester b/bin/tester
@@ -9,7 +9,7 @@
 # SLACK_URL...    - a Slack URL to post the results to (one env var per URL)
 # TEST_SKIP       - list of tests (dir) to skip (spaces between them) (optional)
 # REGISTRY_APIKEY - Set this if you want it to re-build the images
-# REGISTRY        - Image registry to use (defaults to "ibmcom")
+# REGISTRY        - Image registry to use (defaults to "ibmcomtest")
 
 # Set up batch job:
 # ibmcloud ce secret create -n keys ...above keys...
diff --git a/bind-app/build b/bind-app/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
 docker build ${NOCACHE} -t ${REGISTRY}/bind-app -f Dockerfile .
diff --git a/bind-app/run b/bind-app/run
@@ -22,7 +22,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export REGION=$(ibmcloud target | awk '/Region:/{ print $2 }') # Grab region
 
 # Create an instance of Event Streams
diff --git a/bind-job/build b/bind-job/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
 docker build ${NOCACHE} -t ${REGISTRY}/bind-job -f Dockerfile .
diff --git a/bind-job/run b/bind-job/run
@@ -24,7 +24,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export NUM=${COUNT:-10}
 export REGION=$(ibmcloud target | awk '/Region:/{ print $2 }') # Grab region
 
diff --git a/cecli/build b/cecli/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/cecli .
diff --git a/cecli/run b/cecli/run
@@ -21,7 +21,7 @@ function clean() {
 clean
 [[ "$1" == "clean" ]] && exit 0
 
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 set -ex
 
diff --git a/configmaps-env/build b/configmaps-env/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/ce-config-env .
diff --git a/configmaps-env/run b/configmaps-env/run
@@ -18,7 +18,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create a ConfigMap with all possible ways of populating the data:
 # 1 - literal name/value pair from command line
diff --git a/configmaps-vol/build b/configmaps-vol/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/ce-config-vol .
diff --git a/configmaps-vol/run b/configmaps-vol/run
@@ -18,7 +18,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create a ConfigMap with all possible ways of populating the data:
 # 1 - literal name/value pair from command line
diff --git a/cos-event/build b/cos-event/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/cos-listen .
diff --git a/cos-event/run b/cos-event/run
@@ -5,7 +5,7 @@
 # COS_ID: If set, specifies the full CRN of a Cloud Object Storage instance to
 # use
 
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export PROJECT_NAME=$(ibmcloud ce project current | awk '/^Name/{ print $2 }')
 export PROJECT_ID=$(ibmcloud ce project get --name ${PROJECT_NAME} | \
   awk '/^ID/{ print $2 }')
diff --git a/cos2cos/build b/cos2cos/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/cos2cos .
diff --git a/cos2cos/run b/cos2cos/run
@@ -5,7 +5,7 @@
 # COS_ID: If set, specifies the full CRN of a Cloud Object Storage instance to
 # use
 
-REGISTRY=${REGISTRY:-ibmcom}
+REGISTRY=${REGISTRY:-icr.io/codeengine}
 PROJECT_NAME=$(ibmcloud ce project current | awk '/^Name/{ print $2 }')
 PROJECT_REGION=$(ibmcloud ce project current | \
   awk -F: '/^Region/{ print $2 }' | sed -e 's/^[[:space:]]*//' -e "s/[[:space:]]*$//")
diff --git a/cron/build b/cron/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/cron .
diff --git a/cron/run b/cron/run
@@ -18,7 +18,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create the app
 ibmcloud ce app create -n cron-app --image ${REGISTRY}/cron --min-scale=1
diff --git a/cronjob/build b/cronjob/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/cronjob .
diff --git a/cronjob/run b/cronjob/run
@@ -18,7 +18,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create a Job - just it's definition. The "running" instance of it
 # will be created when the event is sent to it.
diff --git a/hello/build b/hello/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/hello .
diff --git a/hello/run b/hello/run
@@ -17,7 +17,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create the app
 ibmcloud ce app create -n hello --image ${REGISTRY}/hello
diff --git a/helloworld/build b/helloworld/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/helloworld .
diff --git a/helloworld/run b/helloworld/run
@@ -18,7 +18,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create the app
 ibmcloud ce app create -n helloworld --image ${REGISTRY}/helloworld
diff --git a/job/build b/job/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the job image and push it
 docker build ${NOCACHE} -t ${REGISTRY}/firstjob -f Dockerfile .
diff --git a/job/run b/job/run
@@ -20,7 +20,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export NUM=${NUM:-10}
 
 # Create a Job definition
diff --git a/job2app/build b/job2app/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
 docker build ${NOCACHE} -t ${REGISTRY}/j2a-app -f Dockerfile.app .
diff --git a/job2app/run b/job2app/run
@@ -18,7 +18,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export COUNT=${COUNT:-50}
 
 # Create the app
diff --git a/kafka/build b/kafka/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the images
 docker build ${NOCACHE} -f Dockerfile.sender -t ${REGISTRY}/kafka-sender .
diff --git a/kafka/run b/kafka/run
@@ -19,7 +19,7 @@ clean
 [[ "$1" == "clean" ]] && exit 0
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 export REGION=$(ibmcloud target | awk '/Region:/{ print $2 }') # Grab region
 
 # This first section sets up an instance of Event Streams (Kafka)
diff --git a/private/build b/private/build
@@ -10,7 +10,7 @@
 # into that registry before you run it.
 
 set -ex
-export REGISTRY=${REGISTRY:-ibmcom}
+export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
 docker build ${NOCACHE} -t ${REGISTRY}/priv-front -f Dockerfile.frontend .
diff --git a/private/run b/private/run
diff --git a/secrets-env/build b/secrets-env/build
diff --git a/secrets-env/run b/secrets-env/run
diff --git a/secrets-vol/build b/secrets-vol/build
diff --git a/secrets-vol/run b/secrets-vol/run
diff --git a/sessions/build b/sessions/build
diff --git a/sessions/run b/sessions/run
diff --git a/testjob/build b/testjob/build
diff --git a/testjob/run b/testjob/run
diff --git a/thumbnail/README.md b/thumbnail/README.md
diff --git a/thumbnail/build b/thumbnail/build
diff --git a/websocket/build b/websocket/build
diff --git a/websocket/run b/websocket/run
