diff --git a/_data/toc.yaml b/_data/toc.yaml index 2c026a01f2..816aa06dfb 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1230,7 +1230,7 @@ reference: - path: /registry/spec/auth/scope/ title: Token scope documentation - path: /registry/spec/auth/token/ - title: Token authentication specification + title: Token authentication specification - sectiontitle: Registry storage drivers section: - path: /registry/storage-drivers/ @@ -3966,8 +3966,6 @@ manuals: title: Advanced automated builds - path: /docker-hub/builds/link-source/ title: Link to GitHub and BitBucket - - path: /docker-hub/builds/classic/ - title: Classic automated builds - sectiontitle: Publisher & certified content section: - path: /docker-hub/publish/ diff --git a/docker-hub/builds/classic.md b/docker-hub/builds/classic.md deleted file mode 100644 index 994578f0aa..0000000000 --- a/docker-hub/builds/classic.md +++ /dev/null @@ -1,90 +0,0 @@ ---- -description: Explains the difference between Classic and new Automated Builds -keywords: automated, build, images -title: Classic Automated Builds ---- - -With the launch of the new Docker Hub, we are introducing an improved Automated Build experience. - -Automated Builds created using an older version of Docker Hub are now labelled "Classic". -If you were using Docker Cloud to manage builds, your builds are already the latest version of Automated Builds. - -All automated builds created going forward will get the new experience. If you are creating a new -Automated Build for the first time, see [docs](/docker-hub/builds.md#configure-automated-build-settings). - -In the coming months, we will gradually convert Classic Automated Builds into new Automated Builds. This should -be a seamless process for most users. - - -## Managing Classic Automated Builds - -You can manage both Classic and new Automated Builds from the **Builds** tab - -Repository with Classic Automated Build: - -![A Classic Automated Build dashboard](images/classic-vs-new-classic-only.png) - - Build settings can be configured similarly to those on the old Docker Hub. - -If you have previously created an automated build in both the old Docker Hub and Docker Cloud, you can switch between -Classic and new Automated Builds. - -New Automated Build is displayed by default. You can switch to Classic Automated Build by clicking on this link at the top - -![Switching to Classic Automated Build](images/classic-vs-new-switch-to-classic.png) - -Likewise, you can switch back to new Automated Build by clicking on this link at the top - -![Switching to new Automated Build](images/classic-vs-new-switch-to-new.png) - - - -## Adding Github webhook manually - -A GitHub webhook allows GitHub to notify Docker Hub when something has -been committed to a given Git repository. - -When you create a Classic Automated Build, a webhook should get automatically added to your GitHub -repository. - -To add, confirm, or modify the webhook, log in to GitHub, then navigate to -the repository. Within the repository, select **Settings > Webhooks**. -You must have admin privileges on the repository to view or modify -this setting. Click **Add webhook**, and use the following settings: - - -| Field | Value | -| ------|------ | -| Payload URL | https://registry.hub.docker.com/hooks/github | -| Content type | application/json | -| Which events would you like to trigger this webhook? | Just the push event | -| Active | checked | - -The image below shows the **Webhooks/Add webhook** form with the above settings reflected: - -![github-webhook-add](/docker-hub/images/github-webhook-add.png) - -If configured correctly, you'll see this in the **Webhooks** view -![github-webhook](/docker-hub/images/github-webhook.png) - - - -## Frequently Asked Questions - - -**Q: I've previously linked my GitHub/Bitbucket account in the old Docker Hub. Why do I need to re-link it?** - -A: The new Docker Hub uses a different permissions model. [Linking is only a few clicks by going to account settings](link-source.md). -with the new Docker Hub. - - > **Note**: If you are linking a source code provider to create autobuilds for a team, follow the instructions to [create a service account](/docker-hub/builds.md#service-users-for-team-autobuilds) for the team before linking the account as described below. - -**Q: What happens to automated builds I created in the old Docker Hub?** - -A: They are now Classic Automated Builds. There are no functional differences with the old automated builds and everything -(build triggers, existing build rules) should continue to work seamlessly. - -**Q: Is it possible to convert an existing Classic Automated Build?** - -A: This is currently unsupported. However, we are working to transition all builds into new experience in -the coming months. diff --git a/docker-hub/builds/images/authorize-builder.png b/docker-hub/builds/images/authorize-builder.png new file mode 100644 index 0000000000..2e741d8e63 Binary files /dev/null and b/docker-hub/builds/images/authorize-builder.png differ diff --git a/docker-hub/builds/images/index-active.png b/docker-hub/builds/images/index-active.png index bd516a89e8..cb7ed20dc2 100644 Binary files a/docker-hub/builds/images/index-active.png and b/docker-hub/builds/images/index-active.png differ diff --git a/docker-hub/builds/images/index-dashboard.png b/docker-hub/builds/images/index-dashboard.png index 6ed32f34fc..a97dd5de6d 100644 Binary files a/docker-hub/builds/images/index-dashboard.png and b/docker-hub/builds/images/index-dashboard.png differ diff --git a/docker-hub/builds/images/index-report.png b/docker-hub/builds/images/index-report.png index be60eda263..03b7c4a423 100644 Binary files a/docker-hub/builds/images/index-report.png and b/docker-hub/builds/images/index-report.png differ diff --git a/docker-hub/builds/images/linked-accounts.png b/docker-hub/builds/images/linked-accounts.png new file mode 100644 index 0000000000..d219db3af3 Binary files /dev/null and b/docker-hub/builds/images/linked-accounts.png differ diff --git a/docker-hub/builds/images/retry-build.png b/docker-hub/builds/images/retry-build.png index cae3d9de70..11fa6c97fc 100644 Binary files a/docker-hub/builds/images/retry-build.png and b/docker-hub/builds/images/retry-build.png differ diff --git a/docker-hub/builds/index.md b/docker-hub/builds/index.md index 4e15af7293..bbf8efc28c 100644 --- a/docker-hub/builds/index.md +++ b/docker-hub/builds/index.md @@ -1,12 +1,13 @@ --- -description: Set up Automated builds -keywords: automated, build, images +description: Set up automated builds +keywords: automated, build, images, Docker Hub redirect_from: - /docker-hub/builds/automated-build/ - /docker-cloud/feature-reference/automated-build/ - /docker-cloud/builds/automated-build/ - /docker-cloud/builds/ -title: Set up Automated builds +- /docker-hub/builds/classic/ +title: Set up automated builds --- @@ -268,22 +269,9 @@ You can specify a regular expression (regex) so that only matching branches or tags are built. You can also use the results of the regex to create the Docker tag that is applied to the built image. -You can use the variable `{sourceref}` to use the branch or tag name that -matched the regex in the Docker tag applied to the resulting built image. (The -variable includes the whole source name, not just the portion that matched the -regex.) You can also use up to nine regular expression capture groups +You can use up to nine regular expression capture groups (expressions enclosed in parentheses) to select a source to build, and reference -these in the Docker Tag field using `{\1}` through `{\9}`. - -**Regex example: build from version number branch and tag with version number** - -You might want to automatically build any branches that end with a number -formatted like a version number, and tag their resulting Docker images using a -name that incorporates that branch name. - -To do this, specify a `branch` build with the regex `/[0-9.]+$/` in the -**Source** field, and use the formula `version-{sourceref}` in the **Docker -tag** field. +these in the **Docker Tag** field using `{\1}` through `{\9}`.