Merge pull request #1976 from bjones1/collect-versions

Clean: Collect version numbers in one place in docker-tools script.

Author: bnmnetp

docker/docker_tools.py

@@ -180,6 +180,17 @@ def pip_user() -> str:
     print("Note: this must be an initial install; additional commands missing.")
 
 
+# Global variables
+# ================
+# Update the following versions regularly.
+CHROMEDRIVER_VERSION = "103.0.5060.53"
+WEB2PY_VERSION = "2.21.1"
+XC16_VERSION = "xc16-v1.70-full-install-linux64-installer.run"
+MPLABX_VERSION = "MPLABX-v6.00-linux-installer.tar"
+# These are sometimes not the same base name (depends on the MPLABX release).
+MPLABX_SH_NAME = "MPLABX-v6.00-linux-installer.sh"
+
+
 # CLI
 # ===
 # Create a series of subcommands for this CLI.
@@ -707,7 +718,7 @@ def _build_phase_1(
             # Tests use `html5validator <https://github.com/svenkreiss/html5validator>`_, which requires the JDK.
             f"{apt_install} openjdk-11-jre-headless git xvfb x11-utils {browser} lsof emacs-nox",
             # Install Chromedriver. Based on https://tecadmin.net/setup-selenium-with-chromedriver-on-debian/.
-            "wget --no-verbose https://chromedriver.storage.googleapis.com/103.0.5060.53/chromedriver_linux64.zip",
+            f"wget --no-verbose https://chromedriver.storage.googleapis.com/{CHROMEDRIVER_VERSION}/chromedriver_linux64.zip",
             "unzip chromedriver_linux64.zip",
             "rm chromedriver_linux64.zip",
             "mv chromedriver /usr/bin/chromedriver",
@@ -726,29 +737,26 @@ def _build_phase_1(
 
     if pic24:
         # When changing the xc16 version, update the string below **and** the path added at the end of this block.
-        xc16_ver = "xc16-v1.70-full-install-linux64-installer.run"
-        mplabx_ver = "MPLABX-v6.00-linux-installer.tar"
-        mplabx_sh = "MPLABX-v6.00-linux-installer.sh"
         xqt(
             # Install the xc16 compiler.
-            f"eatmydata wget --no-verbose https://ww1.microchip.com/downloads/en/DeviceDoc/{xc16_ver}",
-            f"chmod a+x {xc16_ver}",
+            f"eatmydata wget --no-verbose https://ww1.microchip.com/downloads/en/DeviceDoc/{XC16_VERSION}",
+            f"chmod a+x {XC16_VERSION}",
             # The installer complains if the netserver name isn't specified. This option isn't documented in the ``--help``. So, supply junk, and it seems to work.
-            f"eatmydata ./{xc16_ver} --mode unattended --netservername foo",
-            f"rm {xc16_ver}",
+            f"eatmydata ./{XC16_VERSION} --mode unattended --netservername foo",
+            f"rm {XC16_VERSION}",
             # MPLAB X install
             #
             # Needed to run sim30: per https://unix.stackexchange.com/questions/486806/steam-missing-32-bit-libraries-libx11-6, enable 32-bit libs.
             "eatmydata dpkg --add-architecture i386",
             "eatmydata apt-get update",
             "eatmydata apt-get install -y lib32stdc++6 libc6:i386",
             # Then download and install MPLAB X.
-            f'eatmydata wget --no-verbose "https://ww1.microchip.com/downloads/en/DeviceDoc/{mplabx_ver}"',
-            f'eatmydata tar -xf "{mplabx_ver}"',
-            f'rm "{mplabx_ver}"',
+            f'eatmydata wget --no-verbose "https://ww1.microchip.com/downloads/en/DeviceDoc/{MPLABX_VERSION}"',
+            f'eatmydata tar -xf "{MPLABX_VERSION}"',
+            f'rm "{MPLABX_VERSION}"',
             # Install just the IDE and the 16-bit tools. This program checks to see if this is being run by root by looking at the ``USER`` env var, which Docker doesn't set. Fake it out.
-            f'USER=root eatmydata "./{mplabx_sh}" -- --mode unattended --ipe 0 --8bitmcu 0 --32bitmcu 0 --othermcu 0',
-            f'rm "{mplabx_sh}"',
+            f'USER=root eatmydata "./{MPLABX_SH_NAME}" -- --mode unattended --ipe 0 --8bitmcu 0 --32bitmcu 0 --othermcu 0',
+            f'rm "{MPLABX_SH_NAME}"',
         )
         # Add the path to the xc16 tools. Note that ``/root/.bashrc`` doesn't get sourced when Docker starts up; therefore, the `../Dockerfile` invokes bash when running the startup script.
         with open("/root/.bashrc", "a", encoding="utf-8") as f:
@@ -781,7 +789,7 @@ def _build_phase_1(
     )
     w2p_parent = Path(env.WEB2PY_PATH).parent
     xqt(
-        "eatmydata wget --no-verbose https://mdipierro.pythonanywhere.com/examples/static/2.21.1/web2py_src.zip",
+        f"eatmydata wget --no-verbose https://mdipierro.pythonanywhere.com/examples/static/{WEB2PY_VERSION}/web2py_src.zip",
         "eatmydata unzip -q web2py_src.zip",
         "rm -f web2py_src.zip",
         cwd=w2p_parent,