Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ run-name: ${{ inputs.ref }} ${{ inputs.target }}

env:
FILE_HOST: https://mirror-03.infra.openwrt.org
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_USER: ${{ vars.DOCKER_USER }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
QUAY_USER: ${{ secrets.QUAY_USER }}
QUAY_USER: ${{ vars.QUAY_USER }}
QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

on:
Expand Down Expand Up @@ -199,15 +199,15 @@ jobs:
if: github.event_name != 'pull_request' && env.DOCKER_USER != '' && env.DOCKER_TOKEN != ''
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKER_USER }}
username: ${{ vars.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Login to Quay.io Container Registry
if: github.event_name != 'pull_request' && env.QUAY_USER != '' && env.QUAY_TOKEN != ''
uses: docker/login-action@v4
with:
registry: quay.io
username: ${{ secrets.QUAY_USER }}
username: ${{ vars.QUAY_USER }}
password: ${{ secrets.QUAY_TOKEN }}

- name: Docker meta
Expand Down Expand Up @@ -291,15 +291,15 @@ jobs:
if: github.event_name != 'pull_request' && env.DOCKER_USER != '' && env.DOCKER_TOKEN != ''
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKER_USER }}
username: ${{ vars.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Login to Quay.io Container Registry
if: github.event_name != 'pull_request' && env.QUAY_USER != '' && env.QUAY_TOKEN != ''
uses: docker/login-action@v4
with:
registry: quay.io
username: ${{ secrets.QUAY_USER }}
username: ${{ vars.QUAY_USER }}
password: ${{ secrets.QUAY_TOKEN }}

- name: Docker meta (tag or branch)
Expand Down Expand Up @@ -458,15 +458,15 @@ jobs:
if: github.event_name != 'pull_request' && env.DOCKER_USER != '' && env.DOCKER_TOKEN != ''
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKER_USER }}
username: ${{ vars.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Login to Quay.io Container Registry
if: github.event_name != 'pull_request' && env.QUAY_USER != '' && env.QUAY_TOKEN != ''
uses: docker/login-action@v4
with:
registry: quay.io
username: ${{ secrets.QUAY_USER }}
username: ${{ vars.QUAY_USER }}
password: ${{ secrets.QUAY_TOKEN }}

- name: Docker meta
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,16 @@ The GitHub Actions workflow `.github/workflows/containers.yml` automatically bui
By default, the workflow will push containers to `ghcr.io/${{ github.repository_owner }}/<image>`. This works automatically out of the box using GitHub's built-in `GITHUB_TOKEN` and does not require any additional setup.

### Docker Hub & Quay.io
To push to your own Docker Hub or Quay.io registries, you need to configure the following secrets under your repository's **Settings -> Secrets and variables -> Actions**:
To push to your own Docker Hub or Quay.io registries, you need to configure the following variables and secrets under your repository's **Settings -> Secrets and variables -> Actions**:

* **Docker Hub (docker.io)**:
* `DOCKER_USER` - Your Docker Hub username.
* `DOCKER_TOKEN` - Your Docker Hub Personal Access Token.
* `DOCKER_USER` (variable) - Your Docker Hub username.
* `DOCKER_TOKEN` (secret) - Your Docker Hub Personal Access Token.
* **Quay.io (quay.io)**:
* `QUAY_USER` - Your Quay.io username.
* `QUAY_TOKEN` - Your Quay.io OAuth Token / Password.
* `QUAY_USER` (variable) - Your Quay.io username.
* `QUAY_TOKEN` (secret) - Your Quay.io OAuth Token / Password.

If these secrets are not configured, the workflow will automatically skip logging in and pushing to these registries without failing the build.
If these variables and secrets are not configured, the workflow will automatically skip logging in and pushing to these registries without failing the build.

## Build Your Own

Expand Down
Loading