Move a couple of problematic images to the new system that doesn't query tags

.dependabot/config.yml

@@ -8,7 +8,7 @@ update_configs:
     update_schedule: "weekly"
 
   - package_manager: "docker"
-    directory: "/release/preview/alpine311/dependabot"
+    directory: "/release/preview/alpine311/docker"
     update_schedule: "weekly"
 
   - package_manager: "docker"
@@ -24,7 +24,7 @@ update_configs:
     update_schedule: "weekly"
 
   - package_manager: "docker"
-    directory: "/release/preview/fedora/dependabot"
+    directory: "/release/preview/fedora/docker"
     update_schedule: "weekly"
 
   - package_manager: "docker"

release/preview/arm32v7/docker/Dockerfile

@@ -1,10 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-ARG fromTag=bionic
-ARG imageRepo=arm32v7/ubuntu
-
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM arm32v7/ubuntu:bionic AS installer-env
 
 ARG PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -39,7 +36,7 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM ${imageRepo}:${fromTag} AS final-image
+FROM arm32v7/ubuntu:bionic AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-preview

release/preview/arm32v7/meta.json

@@ -10,6 +10,9 @@
         "#psversion#-arm32v7-ubuntu-#tag#",
         "preview-arm32v7-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 550,
         "Arm32": true

release/preview/fedora/docker/Dockerfile

@@ -1,23 +1,20 @@
-# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=28
-ARG imageRepo=fedora
+# Docker image file that describes Fedora 31 image with PowerShell installed from Microsoft YUM Repo
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM fedora:31 AS installer-env
 
 ARG PS_VERSION=7.0.0-preview.1
 ARG PACKAGE_VERSION=7.0.0_preview.1
 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=28
 
 # Define ENVs for Localization/Globalization
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     # set a fixed location for the Module analysis cache
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-31
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \

release/preview/fedora/meta.json

@@ -2,12 +2,15 @@
     "IsLinux" : true,
     "UseLinuxVersion": false,
     "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
-    "osVersion": "Fedora",
+    "osVersion": "Fedora 31",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#psversion#-fedora-#tag#",
         "preview-fedora-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "31"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 632

release/preview/fedora/test-deps/meta.json

@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion": false,
-    "osVersion": "Fedora ${fromTag}",
+    "osVersion": "Fedora 31",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "#tag#"