2 Commits
1.4.1 ... 1.4.3

Author SHA1 Message Date
0818f634dc Fixed failing build. 2026-02-02 07:46:39 +01:00
ec2f2dbd57 Fixed build issues. 2026-02-02 07:23:51 +01:00
4 changed files with 108 additions and 27 deletions

View File

@@ -8,6 +8,9 @@ ARG IS_RELEASE="false"
# Set working directory # Set working directory
WORKDIR /app WORKDIR /app
# Install git for version generation
RUN apk add --no-cache git
# Copy package files # Copy package files
COPY package*.json ./ COPY package*.json ./

View File

@@ -1,6 +1,6 @@
{ {
"name": "jmespath-playground", "name": "jmespath-playground",
"version": "1.4.1", "version": "1.4.3",
"description": "A React-based web application for testing JMESPath expressions against JSON data", "description": "A React-based web application for testing JMESPath expressions against JSON data",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@@ -36,6 +36,15 @@ function getContainerTool() {
} }
} }
function isGitRepo() {
try {
execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
return true;
} catch (error) {
return false;
}
}
async function generateVersionFile() { async function generateVersionFile() {
const versionModuleUrl = pathToFileURL(path.join(__dirname, 'version.mjs')).href; const versionModuleUrl = pathToFileURL(path.join(__dirname, 'version.mjs')).href;
const { generateVersionFile: generate } = await import(versionModuleUrl); const { generateVersionFile: generate } = await import(versionModuleUrl);
@@ -44,6 +53,26 @@ async function generateVersionFile() {
return versionFilePath; return versionFilePath;
} }
function writeVersionFile(version, isRelease) {
const versionFilePath = path.join(__dirname, '..', 'src', 'version.js');
const contents = [
`export const VERSION = '${version}';`,
`export const IS_RELEASE = ${isRelease};`,
''
].join('\n');
fs.writeFileSync(versionFilePath, contents, 'utf8');
return versionFilePath;
}
function readPackageJsonVersion() {
const packagePath = path.join(__dirname, '..', 'package.json');
const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
if (!pkg.version) {
throw new Error('package.json does not contain a version');
}
return pkg.version;
}
function readVersionFile(versionFilePath) { function readVersionFile(versionFilePath) {
const contents = fs.readFileSync(versionFilePath, 'utf8'); const contents = fs.readFileSync(versionFilePath, 'utf8');
const versionMatch = contents.match(/export const VERSION = '([^']+)';/); const versionMatch = contents.match(/export const VERSION = '([^']+)';/);
@@ -79,6 +108,7 @@ Usage:
Options: Options:
--all-arch Build for both arm64 and amd64 (default: build for host architecture only) --all-arch Build for both arm64 and amd64 (default: build for host architecture only)
--arch <arch> Target architecture (arm64 or amd64). Can be specified multiple times. --arch <arch> Target architecture (arm64 or amd64). Can be specified multiple times.
--registry <id> Image registry (default: docker.io). Can also set JMESPATH_REGISTRY.
--help, -h Show this help message and exit --help, -h Show this help message and exit
Examples: Examples:
@@ -86,6 +116,7 @@ Examples:
build-image.mjs --all-arch # Builds for both arm64 and amd64 build-image.mjs --all-arch # Builds for both arm64 and amd64
build-image.mjs --arch arm64 # Builds for arm64 only build-image.mjs --arch arm64 # Builds for arm64 only
build-image.mjs --arch arm64 --arch amd64 # Explicitly specify both build-image.mjs --arch arm64 --arch amd64 # Explicitly specify both
build-image.mjs --registry docker.io # Use Docker Hub registry explicitly
build-image.mjs -h # Show help`); build-image.mjs -h # Show help`);
} }
@@ -105,6 +136,10 @@ async function main() {
type: 'string', type: 'string',
multiple: true, multiple: true,
description: 'Target architecture (arm64 or amd64)' description: 'Target architecture (arm64 or amd64)'
},
registry: {
type: 'string',
description: 'Image registry (default: docker.io)'
} }
}, },
strict: true, strict: true,
@@ -117,8 +152,19 @@ async function main() {
} }
const containerTool = getContainerTool(); const containerTool = getContainerTool();
let version;
let isRelease;
if (isGitRepo()) {
const versionFilePath = await generateVersionFile(); const versionFilePath = await generateVersionFile();
const { version, isRelease } = readVersionFile(versionFilePath); const versionInfo = readVersionFile(versionFilePath);
version = versionInfo.version;
isRelease = versionInfo.isRelease;
} else {
version = readPackageJsonVersion();
isRelease = true;
writeVersionFile(version, isRelease);
}
let architectures; let architectures;
if (values['all-arch']) { if (values['all-arch']) {
@@ -133,14 +179,16 @@ async function main() {
console.log(`Target architectures: ${architectures.join(', ')}`); console.log(`Target architectures: ${architectures.join(', ')}`);
// Build container image // Build container image
const registry = values.registry || process.env.JMESPATH_REGISTRY || 'docker.io';
const imageName = `${registry.replace(/\/$/, '')}/skoszewski/jmespath-playground`;
const tags = isRelease const tags = isRelease
? [ ? [
`-t skoszewski/jmespath-playground:${version}`, `-t ${imageName}:${version}`,
`-t skoszewski/jmespath-playground:latest` `-t ${imageName}:latest`
].join(' ') ].join(' ')
: [ : [
`-t skoszewski/jmespath-playground:dev`, `-t ${imageName}:dev`,
`-t skoszewski/jmespath-playground:latest` `-t ${imageName}:latest`
].join(' '); ].join(' ');
const archFlags = architectures.map(arch => `--arch ${arch}`).join(' '); const archFlags = architectures.map(arch => `--arch ${arch}`).join(' ');
@@ -160,15 +208,15 @@ async function main() {
if (isRelease) { if (isRelease) {
console.log(`\nTo run the container:`); console.log(`\nTo run the container:`);
console.log(` ${containerTool} run --arch arm64 --name jmespathpg -p 3000:3000 skoszewski/jmespath-playground:${version}`); console.log(` ${containerTool} run --arch arm64 --name jmespathpg -p 3000:3000 ${imageName}:${version}`);
if (containerTool === 'docker') { if (containerTool === 'docker') {
console.log(`\nTo push to Docker Hub:`); console.log(`\nTo push to Docker Hub:`);
console.log(` docker push skoszewski/jmespath-playground:${version}`); console.log(` docker push ${imageName}:${version}`);
console.log(` docker push skoszewski/jmespath-playground:latest`); console.log(` docker push ${imageName}:latest`);
} }
} else { } else {
console.log(`\nTo run the container:`); console.log(`\nTo run the container:`);
console.log(` ${containerTool} run --arch arm64 --name jmespathpg -p 3000:3000 skoszewski/jmespath-playground:dev`); console.log(` ${containerTool} run --arch arm64 --name jmespathpg -p 3000:3000 ${imageName}:dev`);
} }
} }

View File

@@ -2,6 +2,24 @@ import { readFileSync, write, writeFileSync } from "fs";
import { execSync } from "child_process"; import { execSync } from "child_process";
import semver from "semver"; import semver from "semver";
export function isGitAvailable() {
try {
execSync("git --version", { stdio: "ignore" });
return true;
} catch (e) {
return false;
}
}
export function isGitRepo() {
try {
execSync("git rev-parse --is-inside-work-tree", { stdio: "ignore" });
return true;
} catch (e) {
return false;
}
}
export function getGitVersion() { export function getGitVersion() {
let rawGitVersion; let rawGitVersion;
let gitVersion; let gitVersion;
@@ -28,13 +46,22 @@ export function getGitVersion() {
} }
export function generateVersionFile(versionFilePath) { export function generateVersionFile(versionFilePath) {
if (!isGitAvailable()) {
throw new Error("Git is required to generate version info.");
}
// Read package.json version // Read package.json version
const packageVersion = JSON.parse( const packageVersion = JSON.parse(
readFileSync("package.json", { encoding: "utf-8" }), readFileSync("package.json", { encoding: "utf-8" }),
).version; ).version;
let gitVersion = packageVersion;
let gitBaseVersion = packageVersion;
let isRelease = true;
if (isGitRepo()) {
// Get version from git repository // Get version from git repository
const gitVersion = getGitVersion(); gitVersion = getGitVersion();
const gitBaseVersion = semver.coerce(gitVersion)?.version; gitBaseVersion = semver.coerce(gitVersion)?.version;
// if git returned malformed version, throw error // if git returned malformed version, throw error
if (!gitBaseVersion || gitBaseVersion === "0.0.0") { if (!gitBaseVersion || gitBaseVersion === "0.0.0") {
@@ -50,6 +77,9 @@ export function generateVersionFile(versionFilePath) {
); );
} }
isRelease = gitVersion === packageVersion;
}
// Generate version file // Generate version file
const buildDate = new Date().toISOString(); const buildDate = new Date().toISOString();
writeFileSync( writeFileSync(
@@ -58,7 +88,7 @@ export function generateVersionFile(versionFilePath) {
// Generated at: ${buildDate} // Generated at: ${buildDate}
export const VERSION = '${packageVersion}'; export const VERSION = '${packageVersion}';
export const IS_RELEASE = ${gitVersion === packageVersion}; export const IS_RELEASE = ${isRelease};
export const BUILD_TIME = '${buildDate}'; export const BUILD_TIME = '${buildDate}';
`, `,
); );