diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index a36172e4c..000000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: 1 - -# update_schedule: live is only supported on javascript, ruby:bundler, python, php:composer, dotnet:nuget, rust:cargo, elixir:hex - -update_configs: - - package_manager: "docker" - directory: "/release/preview/alpine39/dependabot" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/alpine311/docker" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/centos8/dependabot" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/debian10/dependabot" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/debian11/dependabot" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/fedora/docker" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/nanoserver1809/dependabot" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/ubuntu20.04/docker" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/windowsservercore/dependabot" - update_schedule: "weekly" - - - package_manager: "docker" - directory: "/release/preview/alpine38/dependabot" - update_schedule: "weekly" diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..0c02e9b7d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,54 @@ +version: 2 + +# update_schedule: live is only supported on javascript, ruby:bundler, python, php:composer, dotnet:nuget, rust:cargo, elixir:hex + +updates: + - package-ecosystem: "docker" + directory: "/release/preview/alpine39/dependabot" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/alpine311/docker" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/centos8/dependabot" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/debian10/dependabot" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/debian11/dependabot" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/fedora/docker" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/nanoserver1809/dependabot" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/ubuntu20.04/docker" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/windowsservercore/dependabot" + schedule: + interval: "weekly" + + - package-ecosystem: "docker" + directory: "/release/preview/alpine38/dependabot" + schedule: + interval: "weekly" diff --git a/.vsts-ci/phase.yml b/.vsts-ci/phase.yml index b4f526471..b289fc423 100644 --- a/.vsts-ci/phase.yml +++ b/.vsts-ci/phase.yml @@ -42,26 +42,6 @@ jobs: displayName: Install Pester condition: and( succeededOrFailed(), ne(variables['Channel'],'')) - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.8' - displayName: Setup Python engine - condition: succeeded() - - - bash: | - git clone https://github.com/RDIL/dockerlint.git - cd dockerlint - git checkout 0.2.1 - make install-deps - make - cd .. - displayName: Download dockerlint - condition: succeeded() - - - bash: python dockerlint/main.py -d release/${CHANNEL}/${IMAGENAME}/docker/Dockerfile -R - displayName: Run dockerlint - condition: succeeded() - - pwsh: | $extraParams = @{} if($env:ACR_NAME) @@ -95,14 +75,3 @@ jobs: testResultsFiles: '**\test*.xml' testRunTitle: $(ImageName) mergeTestResults: true - - - task: PublishTestResults@2 - condition: and( succeededOrFailed(), ne(variables['Channel'],'')) - displayName: Publish $(ImageName) dockerlint Results - continueOnError: ${{ variables.continueonerror }} - - inputs: - testRunner: JUnit - testResultsFiles: 'dockerlint.test_RESULTS.xml' - testRunTitle: $(ImageName) dockerlint - mergeTestResults: true