diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 736f3130..79675bd9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,6 @@ jobs: name: Prepare id: prep run: | - DOCKER_IMAGE=quay.io/external_storage/nfs-subdir-external-provisioner if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} if [[ $VERSION =~ ^v([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$ ]]; then @@ -27,21 +26,21 @@ jobs: MINOR="${BASH_REMATCH[2]}" PATCH="${BASH_REMATCH[3]}" - TAGS="${DOCKER_IMAGE}:latest" - TAGS="${TAGS},${DOCKER_IMAGE}:${MAJOR}" - TAGS="${TAGS},${DOCKER_IMAGE}:${MAJOR}.${MINOR}" - TAGS="${TAGS},${DOCKER_IMAGE}:${MAJOR}.${MINOR}.${PATCH}" + TAGS="${{ secrets.DOCKER_IMAGE }}:latest" + TAGS="${TAGS},${{ secrets.DOCKER_IMAGE }}:${MAJOR}" + TAGS="${TAGS},${{ secrets.DOCKER_IMAGE }}:${MAJOR}.${MINOR}" + TAGS="${TAGS},${{ secrets.DOCKER_IMAGE }}:${MAJOR}.${MINOR}.${PATCH}" else - TAGS="${DOCKER_IMAGE}:${VERSION}" + TAGS="${{ secrets.DOCKER_IMAGE }}:${VERSION}" fi elif [[ $GITHUB_REF == refs/heads/* ]]; then VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g') if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then VERSION=edge fi - TAGS="${DOCKER_IMAGE}:${VERSION}" + TAGS="${{ secrets.DOCKER_IMAGE }}:${VERSION}" elif [[ $GITHUB_REF == refs/pull/* ]]; then - TAGS="${DOCKER_IMAGE}:pr-${{ github.event.number }}" + TAGS="${{ secrets.DOCKER_IMAGE }}:pr-${{ github.event.number }}" fi echo ::set-output name=tags::${TAGS} echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') @@ -70,7 +69,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.prep.outputs.tags }} build-args: | - APP_FOLDER=/go/src/github.com/kubernetes-sigs/nfs-subdir-external-provisioner + APP_FOLDER="/go/src/github.com/$GITHUB_REPOSITORY" labels: | org.opencontainers.image.title=${{ github.event.repository.name }} org.opencontainers.image.description=${{ github.event.repository.description }} diff --git a/README.md b/README.md index 322922b4..a1aaf3e4 100644 --- a/README.md +++ b/README.md @@ -182,11 +182,11 @@ spec: # Build and publish with GitHub Actions -In a forked repository you can use GitHub Actions pipeline defined in [.github/workflows/release.yml](.github/workflows/release.yml). The pipeline builds Docker images for `linux/amd64`, `linux/arm64`, and `linux/arm/v7` platforms and publishes them using a multi-arch manifest attaching tags according to next rules: -* For master branch it uses `:edge` tag and pushes images to the registry. +In a forked repository you can use GitHub Actions pipeline defined in [.github/workflows/release.yml](.github/workflows/release.yml). The pipeline builds Docker images for `linux/amd64`, `linux/arm64`, and `linux/arm/v7` platforms and publishes them using a multi-arch manifest attaching tags according to the next rules: +* For the master branch, it uses `:edge` tag and pushes images to the registry. * For any other branch except master, it uses the branch name as the tag name replacing `/`s with `-`s, and pushes to the registry. * For any tag matching patter `v{major}.{minor}.{patch}` it creates several tags: `latest`, `{major}`, `{major}:{minor}`, `{major}:{minor}:{patch}` and pushes to the registry. For any other tag, it uses the tag's name as the image tag and pushes too. -* For pull requests it uses ephemeral `:pr-{github.event.number}` tags, builds the images but doesn't push to the registry. +* For pull requests, it uses ephemeral `:pr-{github.event.number}` tags, builds the images but doesn't push to the registry. The pipeline adds several labels: * `org.opencontainers.image.title=${{ github.event.repository.name }}` @@ -198,5 +198,5 @@ The pipeline adds several labels: * `org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }}` **Important:** -* The pipeline performs the docker login command using `REGISTRY_USERNAME` and `REGISTRY_TOKEN` secrets which have to be provided. -* You also need to replace `quay.io/external_storage/nfs-subdir-external-provisioner` with your image name. +* The pipeline performs the docker login command using `REGISTRY_USERNAME` and `REGISTRY_TOKEN` secrets, which have to be provided. +* You also need to provide the `DOCKER_IMAGE` secret specifying your Docker image name, e.g., `quay.io/[username]/nfs-subdir-external-provisioner`.