Skip to content
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

adopt zmk-docker #481

Merged
merged 2 commits into from
Dec 10, 2020
Merged

adopt zmk-docker #481

merged 2 commits into from
Dec 10, 2020

Conversation

innovaker
Copy link
Contributor

No description provided.

@innovaker innovaker added the enhancement New feature or request label Dec 4, 2020
@innovaker innovaker self-assigned this Dec 4, 2020
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 4, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 4, 2020
…ev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 4, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 4, 2020
…on-arm with zmk-dev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
@mcrosson
Copy link
Contributor

mcrosson commented Dec 5, 2020

I can confirm the docker image in this PR works well. I've been using it as my default container for dev since the call for testing went out.

@innovaker innovaker mentioned this pull request Dec 6, 2020
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 6, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 6, 2020
…on-arm with zmk-dev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 7, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 7, 2020
…on-arm with zmk-dev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 8, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 8, 2020
…ev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 8, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 8, 2020
…on-arm with zmk-dev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
@petejohanson
Copy link
Contributor

I can confirm that the zmk-docker stuff is solid, both for current 2.3.0 Zephyr use in main, and for the upcoming 2.4 branch. We should definitely move forward with getting that repo brought under the zmkfirmware organization, and publishing those Docker images under our zmkfirmware Docker hub org.

innovaker added a commit to innovaker/zmk that referenced this pull request Dec 9, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 9, 2020
…on-arm with zmk-dev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 9, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the developer container.

TODO:
Once zmk-docker has been adopted by zmkfirmware, replace with:
    container:
      image: ghcr.io/zmkfirmware/zmk-build-arm:2.3
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.GHCR_TOKEN }}

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 9, 2020
…ev-arm

TODO:
replace:
FROM innovaker/zmk-dev-arm:2.3
with:
FROM zmkfirmware/zmk-dev-arm:2.3

PR: zmkfirmware#481
@innovaker
Copy link
Contributor Author

Great! Thanks @petejohanson.

I've created the zmk-docker repository, but before I push to it we will need to setup the following secrets:

  • DOCKERHUB_TOKEN
  • DOCKERHUB_USERNAME
  • GHCR_TOKEN

Please could you assist?

For the GHCR_TOKEN, my current understanding is that a GitHub Personal Access Token is required because GITHUB_TOKEN doesn't currently work for the GitHub Container Registry. It needs to be a collaborator account (so you, me or Nicell), or perhaps a new machine user - whichever you think is most appropriate.

@petejohanson
Copy link
Contributor

Secrets available

I already had two similarly named secrets, DOCKER_HUB_USERNAME and DOCKER_HUB_PASSWORD (which is just a token value), and I just added the GHCR_TOKEN secret with a personal access token that includes registry write/read access.

@innovaker
Copy link
Contributor Author

innovaker commented Dec 9, 2020

I'll adapt https://github.com/innovaker/zmk-docker to match, test it and then migrate it.

@innovaker
Copy link
Contributor Author

As discussed on Discord, I'm building/testing to this:
image

@petejohanson
Copy link
Contributor

As discussed on Discord, I'm building/testing to this:
image

@innovaker What permissions did you set for the token? Want to be sure we're aligned on that, and I don't need some extra permission granted that you happened to have added.

@innovaker
Copy link
Contributor Author

Following further Discord discussion, we're going with DockerHub as a first pass and will monitor it for rate problems as we scale. Public ghcr.io packages will be our future fallback option if rates become an issue.

I'll update the PR accordingly.

innovaker added a commit to innovaker/zmk that referenced this pull request Dec 10, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the dev container.

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Dec 10, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the dev container.

PR: zmkfirmware#481
@innovaker innovaker marked this pull request as ready for review December 10, 2020 17:42
@innovaker
Copy link
Contributor Author

CI build logs LGTM.

Copy link
Contributor

@petejohanson petejohanson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spot checked builds, tests, zips. Everything looks good!

@petejohanson petejohanson merged commit 5f9244f into zmkfirmware:main Dec 10, 2020
petejohanson pushed a commit that referenced this pull request Dec 10, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the dev container.

PR: #481
@innovaker innovaker deleted the adopt-zmk-docker branch December 10, 2020 22:08
MangoIV pushed a commit to MangoIV/zmk that referenced this pull request Dec 18, 2020
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the dev container.

PR: zmkfirmware#481
innovaker added a commit to innovaker/zmk that referenced this pull request Jun 21, 2021
innovaker added a commit that referenced this pull request Jul 18, 2021
This should've been changed after #481.

See: #481
PR: #845
fsargent pushed a commit to fsargent/zmk that referenced this pull request Nov 19, 2021
Luberry pushed a commit to Luberry/zmk that referenced this pull request Nov 30, 2021
PedroDiogo pushed a commit to PedroDiogo/zmk that referenced this pull request Feb 7, 2022
bromanko pushed a commit to bromanko/zmk that referenced this pull request Feb 25, 2022
tyalie pushed a commit to tyalie/zmk that referenced this pull request Nov 15, 2022
Leverages the new zmk-build-arm Docker image published by the zmk-docker project.  Reduces build times, enhances DevOps capabilities, and tightly couples CI build container with the dev container.

PR: zmkfirmware#481
tyalie pushed a commit to tyalie/zmk that referenced this pull request Nov 15, 2022
NikolaRavic pushed a commit to NikolaRavic/zmk-firmware that referenced this pull request Feb 27, 2023
yuanbin pushed a commit to yuanbin/zmk that referenced this pull request Jun 14, 2023
think4tomorrow added a commit to think4tomorrow/zhc that referenced this pull request Dec 18, 2024
zoowmooz pushed a commit to zoowmooz/zmk that referenced this pull request Feb 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants