mirror of
https://github.com/wagoodman/dive
synced 2026-03-14 22:35:50 +01:00
Update docker image release definitions (#577)
* update docker images * preserve v in docker image tag references
This commit is contained in:
Alex Goodman
GitHub
parent
90317a6c66
commit
55713768e8
4 changed files with 78 additions and 36 deletions
11
.github/workflows/release.yaml
vendored
11
.github/workflows/release.yaml
vendored
|
|
@ -83,9 +83,6 @@ jobs:
|
|||
contents: write
|
||||
# for pushing container images
|
||||
packages: write
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
IMAGE_NAME: ${{ github.repository }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
|
|
@ -94,12 +91,6 @@ jobs:
|
|||
- name: Bootstrap environment
|
||||
uses: ./.github/actions/bootstrap
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Tag release
|
||||
run: |
|
||||
git tag ${{ github.event.inputs.version }}
|
||||
|
|
@ -110,7 +101,7 @@ jobs:
|
|||
- name: Login to container registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
registry: docker.io
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
|
|
|
|||
100
.goreleaser.yaml
100
.goreleaser.yaml
|
|
@ -8,6 +8,11 @@ release:
|
|||
# If set to true, will not auto-publish the release. This is done to allow us to review the changelog before publishing.
|
||||
draft: false
|
||||
|
||||
env:
|
||||
# required to support multi architecture docker builds
|
||||
- DOCKER_CLI_EXPERIMENTAL=enabled
|
||||
- CGO_ENABLED=0
|
||||
|
||||
builds:
|
||||
- binary: dive
|
||||
env:
|
||||
|
|
@ -20,15 +25,15 @@ builds:
|
|||
- amd64
|
||||
- arm64
|
||||
- ppc64le
|
||||
ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.buildTime={{.Date}}`.
|
||||
ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.buildTime={{.Date}}
|
||||
|
||||
brews:
|
||||
- repository:
|
||||
owner: wagoodman
|
||||
name: homebrew-dive
|
||||
token: "{{.Env.TAP_GITHUB_TOKEN}}"
|
||||
homepage: "https://github.com/wagoodman/dive/"
|
||||
description: "A tool for exploring layers in a docker image"
|
||||
homepage: &project_url "https://github.com/wagoodman/dive/"
|
||||
description: &description "A tool for exploring layers in a docker image"
|
||||
|
||||
archives:
|
||||
- format: tar.gz
|
||||
|
|
@ -39,51 +44,96 @@ archives:
|
|||
nfpms:
|
||||
- license: MIT
|
||||
maintainer: Alex Goodman
|
||||
homepage: https://github.com/wagoodman/dive/
|
||||
description: "A tool for exploring layers in a docker image"
|
||||
homepage: *project_url
|
||||
description: *description
|
||||
formats:
|
||||
- rpm
|
||||
- deb
|
||||
|
||||
dockers:
|
||||
- id: docker-amd64
|
||||
# docker.io amd64
|
||||
- &dockerhub_amd64
|
||||
id: docker-amd64
|
||||
ids:
|
||||
- dive
|
||||
use: buildx
|
||||
goarch: amd64
|
||||
image_templates:
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:latest-amd64'
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:{{ .Version }}-amd64'
|
||||
- docker.io/wagoodman/dive:v{{.Version}}-amd64
|
||||
build_flag_templates:
|
||||
- "--build-arg=DOCKER_CLI_VERSION={{.Env.DOCKER_CLI_VERSION}}"
|
||||
- "--platform=linux/amd64"
|
||||
- "--label=org.opencontainers.image.created={{.Date}}"
|
||||
- "--label=org.opencontainers.image.title={{.ProjectName}}"
|
||||
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
|
||||
- "--label=org.opencontainers.image.version={{.Version}}"
|
||||
- "--label=org.opencontainers.image.description=A tool for exploring layers in a docker image"
|
||||
- "--label=org.opencontainers.image.url={{.GitURL}}"
|
||||
- "--label=org.opencontainers.image.source={{.GitURL}}"
|
||||
- "--platform=linux/amd64"
|
||||
- id: docker-arm64
|
||||
- "--label=org.opencontainers.image.version={{.Version}}"
|
||||
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
|
||||
- "--label=org.opencontainers.image.licenses=MIT"
|
||||
- "--label=org.opencontainers.image.authors=Alex Goodman <@wagoodman>"
|
||||
|
||||
# docker.io arm64
|
||||
- &dockerhub_arm64
|
||||
id: docker-arm64
|
||||
ids:
|
||||
- dive
|
||||
use: buildx
|
||||
goarch: arm64
|
||||
image_templates:
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:latest-arm64'
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:{{ .Version }}-arm64'
|
||||
- docker.io/wagoodman/dive:v{{.Version}}-arm64
|
||||
build_flag_templates:
|
||||
- "--build-arg=DOCKER_CLI_VERSION={{.Env.DOCKER_CLI_VERSION}}"
|
||||
- "--platform=linux/arm64/v8"
|
||||
- "--label=org.opencontainers.image.created={{.Date}}"
|
||||
- "--label=org.opencontainers.image.title={{.ProjectName}}"
|
||||
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
|
||||
- "--label=org.opencontainers.image.version={{.Version}}"
|
||||
- "--label=org.opencontainers.image.description=A tool for exploring layers in a docker image"
|
||||
- "--label=org.opencontainers.image.url={{.GitURL}}"
|
||||
- "--label=org.opencontainers.image.source={{.GitURL}}"
|
||||
- "--platform=linux/arm64/v8"
|
||||
- "--label=org.opencontainers.image.version={{.Version}}"
|
||||
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
|
||||
- "--label=org.opencontainers.image.licenses=MIT"
|
||||
- "--label=org.opencontainers.image.authors=Alex Goodman <@wagoodman>"
|
||||
|
||||
# ghcr.io amd64
|
||||
- id: ghcr-amd64
|
||||
<<: *dockerhub_amd64
|
||||
image_templates:
|
||||
- ghcr.io/wagoodman/dive:v{{.Version}}-amd64
|
||||
|
||||
# ghcr.io arm64
|
||||
- id: ghcr-arm64
|
||||
<<: *dockerhub_arm64
|
||||
image_templates:
|
||||
- ghcr.io/wagoodman/dive:v{{.Version}}-arm64
|
||||
|
||||
docker_manifests:
|
||||
- name_template: '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:latest'
|
||||
image_templates:
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:latest-amd64'
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:latest-arm64'
|
||||
- name_template: '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:{{ .Version }}'
|
||||
image_templates:
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:{{ .Version }}-amd64'
|
||||
- '{{ envOrDefault "REGISTRY" "docker.io" }}/wagoodman/dive:{{ .Version }}-arm64'
|
||||
# docker.io manifests
|
||||
- name_template: docker.io/wagoodman/dive:latest
|
||||
image_templates: &dockerhub_images
|
||||
- docker.io/wagoodman/dive:v{{.Version}}-amd64
|
||||
- docker.io/wagoodman/dive:v{{.Version}}-arm64
|
||||
|
||||
- name_template: docker.io/wagoodman/dive:v{{.Major}}
|
||||
image_templates: *dockerhub_images
|
||||
|
||||
- name_template: docker.io/wagoodman/dive:v{{.Major}}.{{.Minor}}
|
||||
image_templates: *dockerhub_images
|
||||
|
||||
- name_template: docker.io/wagoodman/dive:v{{.Version}}
|
||||
image_templates: *dockerhub_images
|
||||
|
||||
# ghcr.io manifests
|
||||
- name_template: ghcr.io/wagoodman/dive:latest
|
||||
image_templates: &ghcr_images
|
||||
- ghcr.io/wagoodman/dive:v{{.Version}}-amd64
|
||||
- ghcr.io/wagoodman/dive:v{{.Version}}-arm64
|
||||
|
||||
- name_template: ghcr.io/wagoodman/dive:v{{.Major}}
|
||||
image_templates: *ghcr_images
|
||||
|
||||
- name_template: ghcr.io/wagoodman/dive:v{{.Major}}.{{.Minor}}
|
||||
image_templates: *ghcr_images
|
||||
|
||||
- name_template: ghcr.io/wagoodman/dive:v{{.Version}}
|
||||
image_templates: *ghcr_images
|
||||
|
|
|
|||
3
Makefile
3
Makefile
|
|
@ -1,7 +1,6 @@
|
|||
BIN = dive
|
||||
TEMP_DIR = ./.tmp
|
||||
PWD := ${CURDIR}
|
||||
REGISTRY ?= docker.io
|
||||
SHELL = /bin/bash -o pipefail
|
||||
TEST_IMAGE = busybox:latest
|
||||
|
||||
|
|
@ -213,7 +212,7 @@ ci-test-docker-image:
|
|||
--rm \
|
||||
-t \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
'${REGISTRY}/wagoodman/dive:latest-amd64' \
|
||||
'docker.io/wagoodman/dive:latest-amd64' \
|
||||
'${TEST_IMAGE}' \
|
||||
--ci
|
||||
|
||||
|
|
|
|||
|
|
@ -192,6 +192,8 @@ nix-env -iA nixpkgs.dive
|
|||
**Docker**
|
||||
```bash
|
||||
docker pull docker.io/wagoodman/dive
|
||||
# or alternatively
|
||||
docker pull ghcr.io/wagoodman/dive
|
||||
```
|
||||
|
||||
When running you'll need to include the Docker socket file:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue