PROJQUAY-1431 - update image references (#125)

Author: thomasmckay

Makefile

@@ -1,8 +1,8 @@
 
 build:
-	@docker run -it --rm --name asciidoctor --detach -v $(CURDIR):/documents/:z asciidoctor/docker-asciidoctor
-	@-docker exec -it asciidoctor bash -c "source build_docs"
-	@docker kill asciidoctor
+	@podman run -it --rm --name asciidoctor --detach -v $(CURDIR):/documents/:z asciidoctor/docker-asciidoctor
+	@-podman exec -it asciidoctor bash -c "source build_docs"
+	@podman kill asciidoctor
 
 view:
 	xdg-open file://$(CURDIR)/dist/welcome.html

modules/attributes.adoc

@@ -10,15 +10,23 @@ ifeval::["{productname}" == "Project Quay"]
 :productminv: qui-gon
 :productrepo: quay.io/projectquay
 :clairnewver: qui-gon
+:quayimage: quay
+:clairimage: clair
+:builderimage: quay-builder
+:builderqemuimage: quay-builder-qemu-fedoracoreos
 endif::[]
 
 ifeval::["{productname}" == "Red Hat Quay"]
 :downstream:
 :productname: Red Hat Quay
 :productversion: 3
-:producty: 3.3
-:productmin: 3.3.1
-:productminv: v3.3.1
-:productrepo: quay.io/redhat
-:clairnewver: v3.3.1
+:producty: 3.4
+:productmin: 3.4.0
+:productminv: v3.4.0
+:productrepo: registry.redhat.io/quay
+:clairnewver: v3.4.0
+:quayimage: quay-rhel8
+:clairimage: clair-rhel8
+:builderimage: quay-builder-rhel8
+:builderqemuimage: quay-builder-qemu-rhcos
 endif::[]

modules/proc_deploy_quay_add.adoc

@@ -59,7 +59,7 @@ the startup process.
    --privileged=true \
    -v /mnt/quay/config:/conf/stack:Z \
    -v /mnt/quay/storage:/datastorage:Z \
-   -d {productrepo}/quay:{productminv}
+   -d {productrepo}/{quayimage}:{productminv}
 ```
 
 . **Open browser to UI**: Once the quay container has started, go to your web browser and
@@ -109,7 +109,7 @@ that is currently stored in `/root/ca.crt`. If not, then remove the line that ad
 $ podman run -d --name mirroring-worker \
   -v /mnt/quay/config:/conf/stack \
   -v /root/ca.crt:/etc/pki/ca-trust/source/anchors/ca.crt \
-  {productrepo}/quay:{productminv} repomirror
+  {productrepo}/{quayimage}:{productminv} repomirror
 ```
 . **Log into config tool**: Log into the {productname} Setup Web UI (config tool).
 . **Enable repository mirroring**: Scroll down the the Repository Mirroring section

modules/proc_deploy_quay_guided.adoc

@@ -12,7 +12,7 @@ Here's an example of how to do that:
 +
 [subs="verbatim,attributes"]
 ....
-# podman run --rm -it --name quay_config -p 8080:8080 {productrepo}/quay:{productminv} config my-secret-password
+# podman run --rm -it --name quay_config -p 8080:8080 {productrepo}/{quayimage}:{productminv} config my-secret-password
 ....
 
 . **Open browser**: When the quay configuration tool starts up, open a browser to the URL and port 8080

modules/proc_deploy_quay_single.adoc

@@ -27,7 +27,9 @@ in link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8
 # yum update -y
 ....
 
-. **Add Quay.io authentication**: Set up authentication to Quay.io, so you can pull the quay container, as described in link:https://access.redhat.com/solutions/3533201[Accessing {productname} without a CoreOS login].
+ifdef::downstream[]
+. **Add registry.redhat.io authentication**: Set up authentication to registry.redhat.io, so you can pull the quay container, as described in link:https://access.redhat.com/RegistryAuthentication[Red Hat Container Registry Authentication]. Note that this differs from earlier {productname} releases where the images were hosted on quay.io.
+endif::downstream[]
 
 . **Setup Docker**: Install, enable, and start the docker service as shown here (see link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html-single/getting_started_with_containers/index#getting_docker_in_rhel_7[Getting Docker in RHEL 7] for details):
 

modules/proc_manage-advanced-config.adoc

@@ -81,7 +81,7 @@ you can simply mount your configuration directory into the Quay container as you
 ....
 # podman run --rm -it --name quay_config -p 8080:8080 \
     -v path/to/config-bundle:/conf/stack \
-    {productrepo}/quay:{productminv} config my-secret-password
+    {productrepo}/{quayimage}:{productminv} config my-secret-password
 ....
 
 . **Open browser**: When the quay configuration tool starts up, open a browser to the URL and port 8080

modules/proc_manage-clairv4.adoc

@@ -47,7 +47,7 @@ This will produce a simple JSON response with the percentage of completed manife
 
 [source,json]
 ```
-{"backfill_percent": 73.4}}
+{"backfill_percent": 73.4}
 ```
 
 Once the majority of the images in your registry have been scanned by Clair V4, the Clair V2 deployment should be removed entirely (both running containers and removal from config).
@@ -213,7 +213,7 @@ spec:
         quay-component: clair-combo
     spec:
       containers:
-        - image: {productrepo}/clair:{productminv}  <1>
+        - image: {productrepo}/{clairimage}:{productminv}  <1>
           imagePullPolicy: IfNotPresent
           name: clair-combo
           env:
@@ -341,7 +341,7 @@ More information about Clair's configuration format can be found in link:https:/
 . Run Clair via the container image, mounting in the configuration from the file you created.
 +
 ```
-$ podman run -p 8080:8080 -p 8089:8089 -e CLAIR_CONF=/clair/config.yaml -e CLAIR_MODE=combo -v /etc/clair4/config:/clair -d {productrepo}/clair:{productminv}
+$ podman run -p 8080:8080 -p 8089:8089 -e CLAIR_CONF=/clair/config.yaml -e CLAIR_MODE=combo -v /etc/clair4/config:/clair -d {productrepo}/{clairimage}:{productminv}
 ```
 
 . Follow the remaining instructions from the previous section for configuring {productname} to use the new Clair V4 endpoint.
@@ -390,13 +390,13 @@ matcher:
 . Export out the latest Updater data to a local archive.  This requires the `clairctl` tool which can be run directly as a binary, or via the Clair container image.  Assume your Clair configuration is in `/etc/clairv4/config/config.yaml`, to run via the container image:
 +
 ```
-$ podman run -it --rm -v /etc/clairv4/config:/cfg:Z -v $(pwd):/updaters:Z --entrypoint /bin/clairctl {productrepo}/clair:{productminv} export-updaters --config /cfg/config.yaml /updaters/updaters.gz
+$ podman run -it --rm -v /etc/clairv4/config:/cfg:Z -v $(pwd):/updaters:Z --entrypoint /bin/clairctl {productrepo}/{clairimage}:{productminv} export-updaters --config /cfg/config.yaml /updaters/updaters.gz
 ```
 +
 Note that you need to explicitly reference the Clair configuration.  This will create the Updater archive in `/etc/clairv4/updaters/updaters.gz`.  If you want to ensure the archive was created without any errors from the source databases, you can supply the `--strict` flag to `clairctl`.  The archive file should be copied over to a volume that is accessible from the disconnected host running Clair.  From the disconnected host, use the same procedure now to import the archive into Clair.
 +
 ```
-$ podman run -it --rm -v /etc/clairv4/config:/cfg:Z -v $(pwd):/updaters:Z --entrypoint /bin/clairctl {productrepo}/clair:{productminv} import-updaters --config /cfg/config.yaml /updaters/updaters.gz
+$ podman run -it --rm -v /etc/clairv4/config:/cfg:Z -v $(pwd):/updaters:Z --entrypoint /bin/clairctl {productrepo}/{clairimage}:{productminv} import-updaters --config /cfg/config.yaml /updaters/updaters.gz
 ```
 +
 

modules/proc_manage-quay-geo-replication.adoc

@@ -89,7 +89,7 @@ Username: yourquayuser
 Password: *****
 # docker run -d -p 443:8443 -p 8080:8080 -v /mnt/quay/config:/conf/stack:Z \
     -e QUAY_DISTRIBUTED_STORAGE_PREFERENCE=europestorage \
-    {productrepo}/quay:{productminv}
+    {productrepo}/{quayimage}:{productminv}
 ----
 endif::downstream[]
 +

modules/proc_upgrade_v3.adoc

@@ -10,8 +10,8 @@ Regardless of which upgrade type you choose, during the time that the {productna
 cluster is down, if you are using builder and clair images, you need to also upgrade to
 those new images:
 
-* The builder image ({productrepo}/quay-builder:v3.0.5)
-* The clair image ({productrepo}/clair-jwt:v3.0.5)
+* The builder image (quay.io/redhat/quay-builder:v3.0.5)
+* The clair image (quay.io/redhat/clair-jwt:v3.0.5)
 
 Both of those images are available from the {productrepo} repository.
 
@@ -31,7 +31,7 @@ V3_UPGRADE_MODE: complete
 (it should take just a few minutes). Use the following container or later:
 +
 ====
-{productrepo}/quay:v3.0.5
+quay.io/redhat/quay:v3.0.5
 ====
 +
 Note that the quay container comes up on ports 8080 and 8443 for v3, instead
@@ -46,7 +46,7 @@ and 8443 into 80 and 443, respectively, as shown in this example:
    --privileged=true \
    -v /mnt/quay/config:/conf/stack:Z \
    -v /mnt/quay/storage:/datastorage:Z \
-   -d {productrepo}/quay:v3.0.5
+   -d quay.io/redhat/quay:v3.0.5
 ```
 
 . After the upgrade completes, bring the {productname} v3 container up on all other nodes.
@@ -71,7 +71,7 @@ running, but it is running on the old data model while the upgrade completes. He
 +
 [subs="verbatim,attributes"]
 ====
-{productrepo}/quay:v3.0.5
+quay.io/redhat/quay:v3.0.5
 ====
 
 . Take down your entire {productname} cluster, including any quay-builder and clair containers.
@@ -98,7 +98,7 @@ and 8443 into 80 and 443, respectively, as shown in this example:
    --privileged=true \
    -v /mnt/quay/config:/conf/stack:Z \
    -v /mnt/quay/storage:/datastorage:Z \
-   -d {productrepo}/quay:v3.0.5
+   -d quay.io/redhat/quay:v3.0.5
 ```
 
 . Bring the {productname} v3 container up on all the other nodes.

modules/ref_deploy_quay_openshift.adoc

@@ -268,7 +268,7 @@ spec:
       spec:
         containers:
         - name: quay-enterprise-config-app
-          image: {productrepo}/quay:{productminv}
+          image: {productrepo}/{quayimage}:{productminv}
           ports:
           - containerPort: 8443
           command: ["/quay-registry/quay-entrypoint.sh"]
@@ -376,7 +376,7 @@ spec:
             secretName: quay-enterprise-config-secret
       containers:
       - name: quay-enterprise-app
-        image: {productrepo}/quay:{productminv}
+        image: {productrepo}/{quayimage}:{productminv}
         ports:
         - containerPort: 8443
         volumeMounts:
@@ -670,7 +670,7 @@ spec:
           secretName: quay-enterprise-config-secret
       containers:
       - name: quay-enterprise-mirror-app
-        image: {productrepo}/quay:{productminv}
+        image: {productrepo}/{quayimage}:{productminv}
         ports:
         - containerPort: 8443
         volumeMounts:

modules/rn_3_00.adoc

@@ -120,11 +120,11 @@ allows {productname} to become better aligned with other Red Hat product offerin
 
 === {productname} images now in redhat repo on Quay.io
 {productname} images formerly stores in the quay.io/coreos repository are moving
-to {productrepo} for {productname} version 3. Available images include:
+to quay.io/redhat for {productname} version 3. Available images include:
 
-* {productrepo}/quay
-* {productrepo}/quay-builder
-* {productrepo}/clair-jwt
+* quay.io/redhat/quay
+* quay.io/redhat/quay-builder
+* quay.io/redhat/clair-jwt
 
 Earlier version of quay and quay-builder images will remain on quay.io/coreos. For example, quay.io/coreos/quay:v2.9.5.