docker: Fix missing CLN version in docker image
Changelog-Fixed: Core lightning version in Docker image will not be missing.
This commit is contained in:
committed by
Sangbida Chaudhuri
parent
31035077fa
commit
5733046617
@@ -1,6 +1,10 @@
|
|||||||
Dockerfile
|
|
||||||
contrib/docker/Dockerfile.*
|
|
||||||
target
|
|
||||||
config.vars
|
config.vars
|
||||||
|
.cargo/
|
||||||
|
.vscode/
|
||||||
|
.venv/
|
||||||
|
dist/
|
||||||
|
target/
|
||||||
release/
|
release/
|
||||||
.venv/
|
focal/
|
||||||
|
jammy/
|
||||||
|
noble/
|
||||||
|
|||||||
3
.github/workflows/docker-release.yml
vendored
3
.github/workflows/docker-release.yml
vendored
@@ -36,6 +36,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.ref }} # Ensures the branch triggering the workflow is checked out
|
ref: ${{ github.ref }} # Ensures the branch triggering the workflow is checked out
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
@@ -116,3 +117,5 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
platforms: ${{ env.PLATFORMS }}
|
platforms: ${{ env.PLATFORMS }}
|
||||||
tags: ${{ env.TAGS }}
|
tags: ${{ env.TAGS }}
|
||||||
|
build-args: |
|
||||||
|
VERSION=${{ env.VERSION }}
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -86,6 +86,7 @@ plugins/clnrest
|
|||||||
plugins/wss-proxy
|
plugins/wss-proxy
|
||||||
plugins/cln-bip353
|
plugins/cln-bip353
|
||||||
.clangd
|
.clangd
|
||||||
|
.cargo/
|
||||||
|
|
||||||
# Build directories
|
# Build directories
|
||||||
bionic/
|
bionic/
|
||||||
|
|||||||
@@ -125,6 +125,8 @@ ARG LD=${target_arch}-ld
|
|||||||
ARG STRIP=${target_arch}-strip
|
ARG STRIP=${target_arch}-strip
|
||||||
ARG TARGET=${target_arch_rust}
|
ARG TARGET=${target_arch_rust}
|
||||||
ARG RUST_PROFILE=release
|
ARG RUST_PROFILE=release
|
||||||
|
ARG VERSION
|
||||||
|
ENV VERSION=${VERSION}
|
||||||
|
|
||||||
#TODO: set all the following cargo config options via env variables (https://doc.rust-lang.org/cargo/reference/environment-variables.html)
|
#TODO: set all the following cargo config options via env variables (https://doc.rust-lang.org/cargo/reference/environment-variables.html)
|
||||||
RUN mkdir -p .cargo && tee .cargo/config.toml <<EOF
|
RUN mkdir -p .cargo && tee .cargo/config.toml <<EOF
|
||||||
|
|||||||
5
Makefile
5
Makefile
@@ -1,7 +1,10 @@
|
|||||||
#! /usr/bin/make
|
#! /usr/bin/make
|
||||||
|
|
||||||
|
# Prefer VERSION from environment if provided (e.g., from GitHub Actions)
|
||||||
# Extract version from git, or if we're from a zipfile, use dirname
|
# Extract version from git, or if we're from a zipfile, use dirname
|
||||||
VERSION=$(shell git describe --tags --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | $(SED) -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|v\1|gp')
|
VERSION ?= $(shell git describe --tags --always --dirty=-modded --abbrev=7 2>/dev/null || \
|
||||||
|
pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc\-]*\)$$|v\1|gp')
|
||||||
|
$(info Building version $(VERSION))
|
||||||
|
|
||||||
# Next release.
|
# Next release.
|
||||||
CLN_NEXT_VERSION := v25.12
|
CLN_NEXT_VERSION := v25.12
|
||||||
|
|||||||
Reference in New Issue
Block a user