Merge branch 'main' into mchammer01/push-protection-public

Author: felicitymay

.github/CODEOWNERS

@@ -24,15 +24,11 @@ package.json @github/docs-engineering
 /translations/log/ @github/docs-localization @Octomerger
 
 # Site Policy
-/content/github/site-policy/ @github/site-policy-admins
+/content/site-policy/ @github/site-policy-admins
 
 # Content strategy
 /contributing/content-markup-reference.md @github/docs-content-strategy
 /contributing/content-style-guide.md @github/docs-content-strategy
 /contributing/content-model.md @github/docs-content-strategy
 /contributing/content-style-guide.md @github/docs-content-strategy
 /contributing/content-templates.md @github/docs-content-strategy
-
-# Make sure that Octokit maintainers get notified about changes
-# relevant to the Octokit libraries (https://github.com/octokit)
-/content/rest/reference @github/octokit-maintainers

.github/actions-scripts/get-preview-app-info.sh

@@ -13,7 +13,6 @@
 [[ -z $APP_NAME_SEED ]] && { echo "Missing APP_NAME_SEED. Exiting."; exit 1; }
 
 PREVIEW_ENV_LOCATION="eastus"
-echo "PREVIEW_ENV_LOCATION=${PREVIEW_ENV_LOCATION}" >> $GITHUB_ENV
 
 REPO_NAME="${GITHUB_REPOSITORY#*\/}"
 echo "REPO_NAME=${REPO_NAME}" >> $GITHUB_ENV
@@ -22,15 +21,14 @@ DEPLOYMENT_NAME="${REPO_NAME}-pr-${PR_NUMBER}"
 echo "DEPLOYMENT_NAME=${DEPLOYMENT_NAME}" >> $GITHUB_ENV
 
 APP_NAME_BASE="${REPO_NAME}-preview-${PR_NUMBER}"
-echo "APP_NAME_BASE=${APP_NAME_BASE}" >> $GITHUB_ENV
 
 # pseudo random string so guessing a preview env URL is more difficult
 APP_SHA=$(echo -n "${APP_NAME_SEED}-${APP_NAME_BASE}" | sha1sum | cut -c1-6)
 
 APP_NAME="${APP_NAME_BASE}-${APP_SHA}"
 echo "APP_NAME=${APP_NAME}" >> $GITHUB_ENV
 
-APP_URL="https://${APP_NAME}.${PREVIEW_ENV_LOCATION}.azurecontainer.io"
+APP_URL="https://${REPO_NAME}-${PR_NUMBER}-${APP_SHA}.preview.ghdocs.com"
 echo "APP_URL=${APP_URL}" >> $GITHUB_ENV
 
 IMAGE_REPO="${GITHUB_REPOSITORY}/pr-${PR_NUMBER}"

.github/workflows/azure-preview-env-deploy.yml

@@ -203,13 +203,10 @@ jobs:
  template: ./azure-preview-env-template.json
  deploymentName: ${{ env.DEPLOYMENT_NAME }}
  parameters: appName="${{ env.APP_NAME }}"
- location="${{ env.PREVIEW_ENV_LOCATION }}"
  containerImage="${{ env.DOCKER_IMAGE }}"
  dockerRegistryUrl="${{ secrets.NONPROD_REGISTRY_SERVER }}"
  dockerRegistryUsername="${{ secrets.NONPROD_REGISTRY_USERNAME }}"
  dockerRegistryPassword="${{ secrets.NONPROD_REGISTRY_PASSWORD }}"
- storageAccountName="${{ secrets.AZURE_STORAGE_ACCOUNT_NAME }}"
- storageAccountKey="${{ secrets.AZURE_STORAGE_ACCOUNT_KEY }}"
  # this shows warnings in the github actions console, because the flag is passed through a validation run,
  # but it *is* functional during the actual execution
  additionalArguments: --no-wait

.github/workflows/optimize-images.yml

@@ -23,6 +23,10 @@ jobs:
  uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
  with:
  ref: ${{ github.head_ref }}
+ # Need to specify a PAT here because otherwise GITHUB_TOKEN is used
+ # by default.  Workflows won't trigger in that case because actions
+ # performed with GITHUB_TOKEN don't trigger other workflows.
+ token: ${{ secrets.DOCUBOT_REPO_PAT }}
 
       - name: Check out base ref
  run: git fetch --no-tags --depth=1 origin $GITHUB_BASE_REF

LICENSE-CODE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 GitHub
+Copyright 2022 GitHub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

assets/images/help/profile/organization-profile-following.png

@@ -11,9 +11,6 @@
  "description": "A unique name for the app"
       }
     },
- "location": {
- "type": "String"
-    },
  "containerImage": {
  "type": "string",
  "defaultValue": null,
@@ -32,12 +29,6 @@
     },
  "dockerRegistryPassword": {
  "type": "SecureString"
-    },
- "storageAccountName": {
- "type": "String"
-    },
- "storageAccountKey": {
- "type": "SecureString"
     }
   },
  "resources": [
@@ -83,53 +74,6 @@
                 }
               }
             }
-          },
-          {
- "name": "caddy-ssl-server",
- "properties": {
- "image": "caddy:2.4.6",
- "command": [
- "caddy",
- "reverse-proxy",
- "--from",
- "[concat(parameters('appName'), '.', parameters('location'), '.azurecontainer.io')]",
- "--to",
- "localhost:4000"
-              ],
- "ports": [
-                {
- "protocol": "TCP",
- "port": 443
-                },
-                {
- "protocol": "TCP",
- "port": 80
-                }
-              ],
- "environmentVariables": [],
- "resources": {
- "requests": {
- "memoryInGB": 1,
- "cpu": 1
-                }
-              },
- "volumeMounts": [
-                {
- "name": "caddy-data",
- "mountPath": "/data"
-                }
-              ]
-            }
-          }
-        ],
- "volumes": [
-          {
- "name": "caddy-data",
- "azureFile": {
- "shareName": "caddy",
- "storageAccountName": "[parameters('storageAccountName')]",
- "storageAccountKey": "[parameters('storageAccountKey')]"
-            }
           }
         ],
  "imageRegistryCredentials": [
@@ -142,17 +86,9 @@
  "restartPolicy": "Always",
  "ipAddress": {
  "ports": [
-            {
- "protocol": "TCP",
- "port": 443
-            },
             {
  "protocol": "TCP",
  "port": 4000
-            },
-            {
- "protocol": "TCP",
- "port": 80
             }
           ],
  "type": "Public",