chore(renovate): lock docker to 28.1.1 for Ubuntu 20.04 #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

janishorsts wants to merge 16 commits into earthly:main from EarthBuild:chore-lock-docker-for-ubuntu-20.04

.arg

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
-    DOCKERHUB_USER=earthly
+    CR_HOST=ghcr.io
+    CR_ORG=earthbuild
     IMAGE_NAME=dind
-    EARTHLY_REPO_VERSION=0b28ef80785fd88df1ec7e674475b02e046d5b36
+    EARTHLY_REPO_VERSION=c10f2cffa9a7020bc6f3c9fbb88fb89c66adf8bd

.github/CODEOWNERS

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,2 +1,2 @@
  
    # PRs require approval from the earthly core team

    * @earthly/core

    # PRs require approval from the EarthBuild admin team

    * @EarthBuild/fork-admins

.github/renovate.json5

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,51 +1,47 @@
  
    {

      $schema: "https://docs.renovatebot.com/renovate-schema.json",

      $schema: 'https://docs.renovatebot.com/renovate-schema.json',

      extends: [

        "config:recommended"

        'config:recommended',

      ],

      forkProcessing: 'enabled',

      configMigration: true,

      prHourlyLimit: 1,

      schedule: [ // utc timezone

        'after 6am on monday',

      ],

      schedule: [],

      enabledManagers: [

        'dockerfile',

        'custom.regex',

        'github-actions',

      ],

      dockerfile: {

        fileMatch: [

          'Earthfile',

        managerFilePatterns: [

          '/Earthfile/',

        ],

      },

      customManagers: [

        {

          // Earthly Version in GH Actions

          customType: 'regex',

          fileMatch: [

            '.*?\\.yml', 

          managerFilePatterns: [

            '/.*?\\.yml/',

          ],

          matchStrings: [

            '- uses: earthly/actions/setup-earthly@.*?[\\s\\n]+.*?[\\s\\n]+with:[\\s\\n]*version: (?<currentValue>.*?)[\\s\\n/]+',

            '- uses: earthbuild/actions-setup@.*?[\\s\\n]+.*?[\\s\\n]+with:[\\s\\n]*version: (?<currentValue>.*?)[\\s\\n/]+',

          ],

          depNameTemplate: 'earthly/earthly',

          depNameTemplate: 'earthbuild/earthbuild',

          datasourceTemplate: 'github-releases',

        },

        {

          // ARG/LET in Earthfile that have a Renovate comment

          customType: 'regex',

          fileMatch: [

            'Earthfile',

          managerFilePatterns: [

            '/Earthfile/',

          ],

          matchStrings: [

            '\\s*#\\s*renovate:\\s*datasource=(?<datasource>.*?)\\s+depName=(?<depName>.*?)[\\s\\n]+(versioning=(?<versioning>.*?)\\s+)?(ARG|LET)\\s+.*?(_VERSION|_VER|version)=(?<currentValue>.*?)($|\\s|\\n)',

          ],

        },

        {

          // Updating the Repology alpine version

          customType: 'regex',

          fileMatch: [

            'Earthfile',

          managerFilePatterns: [

            '/Earthfile/',

          ],

          matchStrings: [

            '# renovate: datasource=repology depName=alpine_(?<currentValue>\\d+_\\d+)',

    @@ -57,41 +53,36 @@
  
          autoReplaceStringTemplate: '# renovate: datasource=repology depName=alpine_{{{newMajor}}}_{{{newMinor}}}',

        },

        {

          // Updating the commit hash of earthly/earthly

          customType: 'regex',

          fileMatch: ['^\\.arg$'],

          managerFilePatterns: [

            '/^\\.arg$/',

          ],

          matchStrings: [

            'EARTHLY_REPO_VERSION=(?<currentDigest>.*?)($|\\s|\\n)',

          ],

          currentValueTemplate: 'main',

          depNameTemplate: 'earthly/earthly',

          packageNameTemplate: 'https://github.com/earthly/earthly',

          depNameTemplate: 'earthbuild/earthbuild',

          packageNameTemplate: 'https://github.com/earthbuild/earthbuild',

          datasourceTemplate: 'git-refs',

        },

        {

          customType: 'regex',

          fileMatch: [

            'docs/dockerhub.md$',

          managerFilePatterns: [

            '/docs/dockerhub.md$/',

          ],

          matchStrings: [

            '\\*\\s+\\`(?<currentValue>.+?)\\`\\n',

          ],

          depNameTemplate: 'earthly/dind',

          depNameTemplate: 'earthbuild/dind',

          datasourceTemplate: 'docker',

        },

      ],

      labels: [

        'renovate',

      ],

      packageRules: [

        // set the group name for alpine dind dependencies

        {

          groupName: "{{{ replace 'os\\/(.*?)$' '$1' packageFileDir}}}-dind-image",

          matchPackagePatterns: [

            'alpine',

            'alpine.*?/docker',

            'docker/docker',

          ],

          matchManagers: [

            'custom.regex',

          ],

    @@ -103,46 +94,75 @@
  
          matchFileNames: [

            'os/**/Earthfile',

          ],

          matchPackageNames: [

            '/alpine/',

            '/alpine.*?/docker/',

            '/docker/docker/',

          ],

        },

        {

          // Lock docker to v28.1.1 for Ubuntu 20.04.

          matchFileNames: [

            'os/ubuntu-20.04/Earthfile',

          ],

          matchPackageNames: [

            'docker/docker',

          ],

          allowedVersions: '28.1.1',

        },

        {

          // Lock docker to v25.0.2 for Ubuntu 23.04.

          matchFileNames: [

            'os/ubuntu-23.04/Earthfile',

          ],

          matchPackageNames: [

            'docker/docker',

          ],

          allowedVersions: '25.0.2',

        },

        {

          // let all package updates auto merge

          matchPackagePatterns: [ '*' ],

          automerge: true,

          matchPackageNames: [

            '*',

          ],

        },

        {

          // rule to update earthly/dind:alpine-* images

          groupName: 'docs-dind-images',

          matchPackageNames: ['earthly/dind'],

          matchCurrentVersion: "/^alpine-.*/",

          allowedVersions: "/^alpine-.*/",

          versioning: "regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-r(?<revision>\\d+)$",

          matchPackageNames: [

            'earthbuild/dind',

          ],

          matchCurrentVersion: '/^alpine-.*/',

          allowedVersions: '/^alpine-.*/',

          versioning: 'regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-r(?<revision>\\d+)$',

        },

        {

          // rule to update earthly/dind:ubuntu:20.04-* images

          groupName: 'docs-dind-images',

          matchPackageNames: ['earthly/dind'],

          matchCurrentVersion: "/^ubuntu-20\\.04-.*/",

          allowedVersions: "/^ubuntu-20\\.04-.*/",

          versioning: "regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-(?<revision>\\d+)$",

          matchPackageNames: [

            'earthbuild/dind',

          ],

          matchCurrentVersion: '/^ubuntu-20\\.04-.*/',

          allowedVersions: '/^ubuntu-20\\.04-.*/',

          versioning: 'regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-(?<revision>\\d+)$',

        },

        {

          // rule to update earthly/dind:ubuntu:23.04-* images

          groupName: 'docs-dind-images',

          matchPackageNames: ['earthly/dind'],

          matchCurrentVersion: "/^ubuntu-23\\.04-.*/",

          allowedVersions: "/^ubuntu-23\\.04-.*/",

          versioning: "regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-(?<revision>\\d+)$",

          matchPackageNames: [

            'earthbuild/dind',

          ],

          matchCurrentVersion: '/^ubuntu-23\\.04-.*/',

          allowedVersions: '/^ubuntu-23\\.04-.*/',

          versioning: 'regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-(?<revision>\\d+)$',

        },

        {

          // rule to update earthly/dind:ubuntu:24.04-* images

          groupName: 'docs-dind-images',

          matchPackageNames: ['earthly/dind'],

          matchCurrentVersion: "/^ubuntu-24\\.04-.*/",

          allowedVersions: "/^ubuntu-24\\.04-.*/",

          versioning: "regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-(?<revision>\\d+)$",

          matchPackageNames: [

            'earthbuild/dind',

          ],

          matchCurrentVersion: '/^ubuntu-24\\.04-.*/',

          allowedVersions: '/^ubuntu-24\\.04-.*/',

          versioning: 'regex:^(?<compatibility>.*)-(?<major>\\d+\\.\\d+)-docker-(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)-(?<revision>\\d+)$',

        },

        {

          // create PRs for multiple docker versions in case we're more than one major version behind

          matchPackageNames: [

            'docker/docker',

          ],

.github/workflows/ci.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,35 +5,46 @@ on:
  
      # push:

      #   branches: [ "main" ]

      pull_request:

        branches: [ "main" ]

        branches: ["main"]

    concurrency:

      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

      cancel-in-progress: true

    jobs:

      test:

        name: test

        runs-on: ubuntu-latest

        permissions:

          contents: read

          packages: write

        env:

          FORCE_COLOR: 1

          EARTHLY_CONVERSION_PARALLELISM: "5"

          EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"

          EARTHLY_INSTALL_ID: "earthly-dind-githubactions"

          EARTHLY_INSTALL_ID: "earthbuild-dind-githubactions"

        steps:

          - uses: earthly/actions/setup-earthly@v1

          - uses: actions/checkout@v4

          # The dind (common+alpine-kind-test and common+ubuntu-kind-test) detects

          # the host's IPv6 capability and then requires IPv6 NAT to create networks

          # for kind. So we load it here.

          # Ref: https://github.com/moby/moby/pull/47062

          - name: Load kernel module IPv6 NAT

            run: sudo modprobe ip6table_nat

          - name: Set up Docker Hub mirrors

            run: |

              sudo mkdir -p /etc/docker

              echo '{"registry-mirrors": ["https://mirror.gcr.io", "https://public.ecr.aws"]}' | sudo tee /etc/docker/daemon.json

              sudo systemctl restart docker

          - name: Set up QEMU

            run: |

              sudo apt-get update

              sudo apt-get install -y qemu-user-static binfmt-support

              sudo update-binfmts --display

          - uses: earthbuild/actions-setup@main

            with:

              version: v0.8.15

          - uses: actions/checkout@v4

          - name: Docker login (non fork only)

            run: |-

              docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password "${{ secrets.DOCKERHUB_TOKEN }}"

              docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}"

            if: github.event.pull_request.head.repo.full_name == github.repository

          - name: Configure Earthly to use mirror (non fork only)

            run: |-

              earthly config global.buildkit_additional_config "'[registry.\"docker.io\"]

              mirrors = [\"registry-1.docker.io.mirror.corp.earthly.dev\"]'"

          - name: Log in to GitHub Container Registry (non fork only)

            run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin

            if: github.event.pull_request.head.repo.full_name == github.repository

          - name: Run tests

            run: earthly --ci -P --push --org earthly-technologies --satellite dind +test

            run: earthly --ci -P --push +test

.github/workflows/release.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,25 +9,40 @@ jobs: @@
         name: release after merging ${{ github.head_ref }}
         if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'renovate/') && endsWith(github.head_ref, '-dind-image')
         runs-on: ubuntu-latest
+        permissions:
+          contents: read
+          packages: write
         env:
           FORCE_COLOR: 1
           EARTHLY_CONVERSION_PARALLELISM: "5"
-          EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
-          EARTHLY_INSTALL_ID: "earthly-dind-githubactions"
+          EARTHLY_INSTALL_ID: "earthbuild-dind-githubactions"
         steps:
-          - uses: earthly/actions/setup-earthly@v1
+          - uses: actions/checkout@v4
+          # The dind (common+alpine-kind-test and common+ubuntu-kind-test) detects
+          # the host's IPv6 capability and then requires IPv6 NAT to create networks
+          # for kind. So we load it here.
+          # Ref: https://github.com/moby/moby/pull/47062
+          - name: Load kernel module IPv6 NAT
+            run: sudo modprobe ip6table_nat
+          - name: Set up Docker Hub mirrors
+            run: |
+              sudo mkdir -p /etc/docker
+              echo '{"registry-mirrors": ["https://mirror.gcr.io", "https://public.ecr.aws"]}' | sudo tee /etc/docker/daemon.json
+              sudo systemctl restart docker
+          - name: Set up QEMU
+            run: |
+              sudo apt-get update
+              sudo apt-get install -y qemu-user-static binfmt-support
+              sudo update-binfmts --display
+          - uses: earthbuild/actions-setup@main
             with:
               version: v0.8.15
-          - uses: actions/checkout@v4
-          - name: Docker login (non fork only)
+          - name: Log in to container registries (non fork only)
             run: |-
               docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password "${{ secrets.DOCKERHUB_TOKEN }}"
-              docker login registry-1.docker.io.mirror.corp.earthly.dev --username "${{ secrets.DOCKERHUB_MIRROR_USERNAME }}" --password "${{ secrets.DOCKERHUB_MIRROR_PASSWORD }}"
-            if: github.event.pull_request.head.repo.full_name == github.repository
-          - name: Configure Earthly to use mirror (non fork only)
-            run: |-
-              earthly config global.buildkit_additional_config "'[registry.\"docker.io\"]
-              mirrors = [\"registry-1.docker.io.mirror.corp.earthly.dev\"]'"
+              docker login ghcr.io --username ${{ github.actor }} --password "${{ secrets.GITHUB_TOKEN }}"
             if: github.event.pull_request.head.repo.full_name == github.repository
           - name: Build & Push image
-            run: earthly --ci -P --push --org earthly-technologies --satellite dind +release --RENOVATE_BRANCH=${{github.head_ref}}
+            run: |
+              earthly --ci -P --push +release --RENOVATE_BRANCH=${{github.head_ref}} # default:ghcr.io
+              earthly --ci -P --push +release --RENOVATE_BRANCH=${{github.head_ref}} --CR_HOST=docker.io

.github/workflows/update_readme.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ jobs: @@
             with:
               token: ${{ secrets.GITHUB_TOKEN }}
           - name: Update DockerHub description for earthly/dind
-            uses: peter-evans/[email protected].0
+            uses: peter-evans/[email protected].2
             with:
               username: ${{ secrets.DOCKERHUB_USERNAME }}
               password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(renovate): lock docker to 28.1.1 for Ubuntu 20.04 #129

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!