Honor DOCKER_DEFAULT_PLATFORM

Otherwise we sometimes see errors like:

```
cerc-webapp-deployer:   File "/root/.shiv/laconic-so_0f937aa98c2748ef9af8585d6f441dbc01546ace0d6660cbb159d1e5040aeddf/site-packages/stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py", line 671, in command
cerc-webapp-deployer:     shutil.rmtree(tempdir)
cerc-webapp-deployer:   File "/usr/lib/python3.10/shutil.py", line 725, in rmtree
cerc-webapp-deployer:     _rmtree_safe_fd(fd, path, onerror)
cerc-webapp-deployer:   File "/usr/lib/python3.10/shutil.py", line 681, in _rmtree_safe_fd
cerc-webapp-deployer:     onerror(os.unlink, fullname, sys.exc_info())
cerc-webapp-deployer:   File "/usr/lib/python3.10/shutil.py", line 679, in _rmtree_safe_fd
cerc-webapp-deployer:     os.unlink(entry.name, dir_fd=topfd)
cerc-webapp-deployer: FileNotFoundError: [Errno 2] No such file or directory: 'S.gpg-agent.extra'
```

Reviewed-on: #941
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>

stack_orchestrator/build/fetch_containers.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.
 
 import click
+import os
 from dataclasses import dataclass
 import json
 import platform
@@ -84,13 +85,18 @@ def _filter_for_platform(container: str,
                          tag_list: List[str]) -> List[str] :
     filtered_tags = []
     this_machine = platform.machine()
-    # Translate between Python and docker platform names
-    if this_machine == "x86_64":
-        this_machine = "amd64"
-    if this_machine == "aarch64":
-        this_machine = "arm64"
-    if opts.o.debug:
-        print(f"Python says the architecture is: {this_machine}")
+    if "DOCKER_DEFAULT_PLATFORM" in os.environ:
+        this_machine =  os.environ["DOCKER_DEFAULT_PLATFORM"].split("/")[-1]
+        if opts.o.debug:
+            print(f"DOCKER_DEFAULT_PLATFORM says the architecture is: {this_machine}")
+    else:
+        # Translate between Python and docker platform names
+        if this_machine == "x86_64":
+            this_machine = "amd64"
+        if this_machine == "aarch64":
+            this_machine = "arm64"
+        if opts.o.debug:
+            print(f"Python says the architecture is: {this_machine}")
     docker = DockerClient()
     for tag in tag_list:
         remote_tag = f"{registry_info.registry}/{container}:{tag}"

stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py

@@ -668,4 +668,4 @@ def command(  # noqa: C901
         main_logger.log("UNCAUGHT ERROR:" + str(e))
         raise e
     finally:
-        shutil.rmtree(tempdir)
+        shutil.rmtree(tempdir, ignore_errors=True)

stack_orchestrator/deploy/webapp/request_webapp_deployment.py

@@ -49,6 +49,7 @@ def fatal(msg: str):
     required=True,
 )
 @click.option("--env-file", help="environment file for webapp")
+@click.option("--config-ref", help="The ref of an existing config upload to use.")
 @click.option(
     "--make-payment",
     help="The payment to make (in alnt).  The value should be a number or 'auto' to use the deployer's minimum required payment.",
@@ -69,6 +70,7 @@ def command(
     app,
     deployer,
     env_file,
+    config_ref,
     make_payment,
     use_payment,
     dns,
@@ -86,7 +88,8 @@ def command(
         if not deployer_record:
             fatal(f"Unable to locate deployer: {deployer}")
 
-        config_ref = None
+        if env_file and config_ref:
+            fatal("Cannot use --env-file and --config-ref at the same time.")
 
         # If env_file
         if env_file:
@@ -132,9 +135,7 @@ def command(
                 "version": "1.0.0",
                 "name": f"{app_record.attributes.name}@{app_record.attributes.version}",
                 "deployer": deployer,
-                "meta": {
-                    "when": str(datetime.utcnow())
-                }
+                "meta": {"when": str(datetime.utcnow())},
             }
         }
 
@@ -171,4 +172,4 @@ def command(
         # Send the request
         laconic.publish(deployment_request)
     finally:
-        shutil.rmtree(tempdir)
+        shutil.rmtree(tempdir, ignore_errors=True)