Skip to content

hack: handle prefixed version formats in gen-ver.sh#291

Merged
crazy-max merged 1 commit intodocker:mainfrom
vvoland:non-go-tag
Oct 8, 2025
Merged

hack: handle prefixed version formats in gen-ver.sh#291
crazy-max merged 1 commit intodocker:mainfrom
vvoland:non-go-tag

Conversation

@vvoland
Copy link
Copy Markdown
Collaborator

@vvoland vvoland commented Oct 8, 2025

No description provided.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland self-assigned this Oct 8, 2025
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

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

Hum I think we need to adapt GIT_TAG as well

-
name: Resolve metadata
run: |
for l in $(cat ./bin/pkg/${{ inputs.name }}/metadata.env); do
export "${l?}"
echo "${l?}" >> $GITHUB_ENV
done
if [ "${{ github.event_name }}" = "schedule" ]; then
echo "GIT_TAG=nightly/${{ inputs.name }}/$VERSION" >> $GITHUB_ENV
else
echo "GIT_TAG=${{ inputs.name }}/$VERSION" >> $GITHUB_ENV
fi

@vvoland
Copy link
Copy Markdown
Collaborator Author

vvoland commented Oct 8, 2025

Hmm I think using PKG_REF instead of VERSION would do the trick?

EDIT: Oh, looks like it won't. VERSION should actually be good as it's the one that's populated by the value from the genver script?

VERSION=${GENVER_VERSION}

if [[ "$version" =~ .*/v[0-9] ]]; then
version="${version##*/}"
fi
# docker-v29.0.0 -> v29.0.0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just curious, this is the future tagging strategy starting moby 29?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Yes, it's supposed to be a tag that's not going to be picked up by Go as a valid go module (because github.com/moby/moby module has different versioning than Docker Engine)

@crazy-max crazy-max merged commit bce54f6 into docker:main Oct 8, 2025
845 checks passed
@vvoland
Copy link
Copy Markdown
Collaborator Author

vvoland commented Oct 8, 2025

Hmm looks like it's not working right:

$ PKG_REF='cmd/cli/v0.1.44' bake --set '*.platform=linux/amd64'  pkg-model-debian13
$ dpkg-deb -I $(find bin -name '*.deb')
 new Debian package, version 2.0.
 size 6961832 bytes: control archive=584 bytes.
     369 bytes,    12 lines      control
     166 bytes,     2 lines      md5sums
 Package: docker-model-plugin
 Version: 039f7a3-1~debian.13~trixie
 Architecture: amd64
 Maintainer: Docker <support@docker.com>
 Installed-Size: 26419
 Enhances: docker-ce-cli
 Section: admin
 Priority: optional
 Homepage: https://docs.docker.com/model-runner/
 Description: Docker Model Runner plugin for the Docker CLI.
  .
  This plugin provides the 'docker model' subcommand.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants