Fix version display issues, container shutdown problems, and modernize build scripts
This commit is contained in:
89
scripts/build-image.js
Normal file
89
scripts/build-image.js
Normal file
@@ -0,0 +1,89 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const { execSync } = require('child_process');
|
||||
const fs = require('fs');
|
||||
|
||||
function execCommand(command, description) {
|
||||
try {
|
||||
console.log(`${description}...`);
|
||||
execSync(command, { stdio: 'inherit' });
|
||||
} catch (error) {
|
||||
console.error(`Error: ${description} failed`);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
function getContainerTool() {
|
||||
// Check for Docker first (primary tool)
|
||||
try {
|
||||
execSync('docker --version', { stdio: 'ignore' });
|
||||
return 'docker';
|
||||
} catch (error) {
|
||||
// Fall back to Apple's container command
|
||||
try {
|
||||
execSync('container --version', { stdio: 'ignore' });
|
||||
return 'container';
|
||||
} catch (error) {
|
||||
console.error('Error: No container tool found. Please install Docker or Apple Container Tools to build container images.');
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getVersion() {
|
||||
try {
|
||||
// Try to get version from git tag
|
||||
const gitTag = execSync('git tag --points-at HEAD', { encoding: 'utf8' }).trim();
|
||||
if (gitTag) {
|
||||
return { version: gitTag.replace(/^v/, ''), isRelease: true };
|
||||
}
|
||||
} catch (error) {
|
||||
// Git command failed, ignore
|
||||
}
|
||||
|
||||
// Development build - use package.json version with -dev suffix
|
||||
const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
|
||||
return { version: `${packageJson.version}-dev`, isRelease: false };
|
||||
}
|
||||
|
||||
function main() {
|
||||
const containerTool = getContainerTool();
|
||||
const { version, isRelease } = getVersion();
|
||||
|
||||
console.log(`Building ${isRelease ? 'release' : 'development'} version: ${version}`);
|
||||
|
||||
// Build container image
|
||||
const tags = isRelease
|
||||
? [
|
||||
`-t skoszewski/jmespath-playground:${version}`,
|
||||
`-t skoszewski/jmespath-playground:latest`
|
||||
].join(' ')
|
||||
: [
|
||||
`-t skoszewski/jmespath-playground:dev`,
|
||||
`-t skoszewski/jmespath-playground:latest`
|
||||
].join(' ');
|
||||
|
||||
const buildCommand = `${containerTool} build --build-arg VERSION="${version}" --build-arg IS_RELEASE="${isRelease}" ${tags} .`;
|
||||
|
||||
execCommand(buildCommand, 'Building container image');
|
||||
|
||||
console.log('Container image build completed successfully!');
|
||||
|
||||
// Show usage instructions
|
||||
if (isRelease) {
|
||||
console.log(`\nTo run the container:`);
|
||||
console.log(` ${containerTool} run -p 3000:3000 skoszewski/jmespath-playground:${version}`);
|
||||
if (containerTool === 'docker') {
|
||||
console.log(`\nTo push to Docker Hub:`);
|
||||
console.log(` docker push skoszewski/jmespath-playground:${version}`);
|
||||
console.log(` docker push skoszewski/jmespath-playground:latest`);
|
||||
}
|
||||
} else {
|
||||
console.log(`\nTo run the container:`);
|
||||
console.log(` ${containerTool} run -p 3000:3000 skoszewski/jmespath-playground:dev`);
|
||||
}
|
||||
}
|
||||
|
||||
if (require.main === module) {
|
||||
main();
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# JMESPath Testing Tool - Docker Image Build Script
|
||||
|
||||
set -e
|
||||
|
||||
echo "🐳 JMESPath Testing Tool - Docker Image Build"
|
||||
echo "=============================================="
|
||||
echo ""
|
||||
|
||||
# Check if Docker is available
|
||||
if ! command -v docker &> /dev/null; then
|
||||
echo "❌ Docker not found. Please install Docker to build container images."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Determine version information for Docker build
|
||||
VERSION=$(git tag --points-at HEAD 2>/dev/null | sed 's/^v//' | head -n 1)
|
||||
|
||||
if [ -n "$VERSION" ]; then
|
||||
# We're at a tagged commit - release build
|
||||
echo "📦 Building release version: $VERSION"
|
||||
docker build \
|
||||
--build-arg VERSION="$VERSION" \
|
||||
--build-arg IS_RELEASE="true" \
|
||||
-t skoszewski/jmespath-playground:$VERSION \
|
||||
-t skoszewski/jmespath-playground:latest .
|
||||
echo "✅ Built Docker images: skoszewski/jmespath-playground:$VERSION, skoszewski/jmespath-playground:latest"
|
||||
|
||||
echo ""
|
||||
echo "To run the release container:"
|
||||
echo " docker run -p 3000:3000 skoszewski/jmespath-playground:$VERSION"
|
||||
echo " docker run -p 3000:3000 skoszewski/jmespath-playground:latest"
|
||||
|
||||
echo ""
|
||||
echo "To push to Docker Hub:"
|
||||
echo " docker push skoszewski/jmespath-playground:$VERSION"
|
||||
echo " docker push skoszewski/jmespath-playground:latest"
|
||||
else
|
||||
# Development build
|
||||
PACKAGE_VERSION=$(grep '"version"' package.json | cut -d'"' -f4)
|
||||
DEV_VERSION="${PACKAGE_VERSION}-dev"
|
||||
echo "📦 Building development version: $DEV_VERSION"
|
||||
docker build \
|
||||
--build-arg VERSION="$DEV_VERSION" \
|
||||
--build-arg IS_RELEASE="false" \
|
||||
-t skoszewski/jmespath-playground:dev \
|
||||
-t skoszewski/jmespath-playground:latest .
|
||||
echo "✅ Built Docker images: skoszewski/jmespath-playground:dev, skoszewski/jmespath-playground:latest"
|
||||
|
||||
echo ""
|
||||
echo "To run the development container:"
|
||||
echo " docker run -p 3000:3000 skoszewski/jmespath-playground:dev"
|
||||
echo " docker run -p 3000:3000 skoszewski/jmespath-playground:latest"
|
||||
|
||||
echo ""
|
||||
echo "To push to Docker Hub:"
|
||||
echo " docker push skoszewski/jmespath-playground:dev"
|
||||
echo " docker push skoszewski/jmespath-playground:latest"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "🎉 Docker image build completed successfully!"
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# JMESPath Testing Tool - Build Script
|
||||
|
||||
set -e
|
||||
|
||||
echo "🚀 JMESPath Testing Tool - Build Script"
|
||||
echo "======================================="
|
||||
echo ""
|
||||
|
||||
# Check Node.js version
|
||||
if command -v node &> /dev/null; then
|
||||
NODE_VERSION=$(node --version | sed 's/v//')
|
||||
MAJOR_VERSION=$(echo $NODE_VERSION | cut -d. -f1)
|
||||
if [ "$MAJOR_VERSION" -ge 24 ]; then
|
||||
echo "✅ Node.js $NODE_VERSION (compatible with v24+ requirement)"
|
||||
else
|
||||
echo "❌ Node.js $NODE_VERSION found, but v24+ is required"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "❌ Node.js not found. Please install Node.js 24 LTS or higher."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Build the React application
|
||||
echo "📦 Installing dependencies..."
|
||||
npm install
|
||||
|
||||
echo "🔨 Building production bundle..."
|
||||
npm run build
|
||||
|
||||
echo "✅ Build completed successfully!"
|
||||
echo ""
|
||||
echo "To run the application:"
|
||||
echo " npm run server # Run integrated server locally"
|
||||
echo ""
|
||||
echo "To build Docker image:"
|
||||
echo " scripts/build-image.sh # Build Docker container image"
|
||||
@@ -1,30 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# JMESPath Testing Tool - Development Script
|
||||
|
||||
set -e
|
||||
|
||||
echo "🚀 JMESPath Testing Tool - Development"
|
||||
echo "====================================="
|
||||
echo ""
|
||||
|
||||
# Check Node.js
|
||||
if command -v node &> /dev/null; then
|
||||
echo "✅ Node.js version: $(node --version)"
|
||||
else
|
||||
echo "❌ Node.js not found. Please install Node.js 24 LTS."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Install dependencies if needed
|
||||
if [ ! -d "node_modules" ]; then
|
||||
echo "📦 Installing dependencies..."
|
||||
npm install
|
||||
fi
|
||||
|
||||
# Start development server
|
||||
echo "🚀 Starting development server..."
|
||||
echo " The app will open at http://localhost:3000"
|
||||
echo " Press Ctrl+C to stop the server"
|
||||
echo ""
|
||||
npm start
|
||||
@@ -2,63 +2,57 @@
|
||||
|
||||
/**
|
||||
* JMESPath Playground Upload Script (JavaScript)
|
||||
* Usage: node upload.js [-u URL] "json_file.json"
|
||||
* Usage: node upload.js [-u URL] [-k API_KEY] "json_file.json"
|
||||
*/
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const https = require('https');
|
||||
const http = require('http');
|
||||
const { URL } = require('url');
|
||||
const { parseArgs } = require('util');
|
||||
|
||||
function showUsage() {
|
||||
const scriptName = path.basename(process.argv[1]);
|
||||
console.log(`Usage: node ${scriptName} [-u|--url URL] <json_file>`);
|
||||
console.log(`Usage: node ${scriptName} [-u|--url URL] [-k|--key API_KEY] <json_file>`);
|
||||
console.log('');
|
||||
console.log('Options:');
|
||||
console.log(' -u, --url URL API URL (default: http://localhost:3000)');
|
||||
console.log(' -h, --help Show this help message');
|
||||
console.log(' -u, --url URL API URL (default: http://localhost:3000)');
|
||||
console.log(' -k, --key API_KEY API key (not required for localhost)');
|
||||
console.log(' -h, --help Show this help message');
|
||||
console.log('');
|
||||
console.log('Example:');
|
||||
console.log('Examples:');
|
||||
console.log(` node ${scriptName} data.json`);
|
||||
console.log(` node ${scriptName} -u http://example.com:3000 data.json`);
|
||||
console.log(` node ${scriptName} -u http://example.com:3000 -k your-api-key data.json`);
|
||||
}
|
||||
|
||||
function parseArguments() {
|
||||
const args = process.argv.slice(2);
|
||||
let apiUrl = 'http://localhost:3000';
|
||||
let jsonFile = '';
|
||||
function getArguments() {
|
||||
const { values, positionals } = parseArgs({
|
||||
args: process.argv.slice(2),
|
||||
options: {
|
||||
url: { type: 'string', short: 'u', default: 'http://localhost:3000' },
|
||||
key: { type: 'string', short: 'k' },
|
||||
help: { type: 'boolean', short: 'h' }
|
||||
},
|
||||
allowPositionals: true
|
||||
});
|
||||
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const arg = args[i];
|
||||
|
||||
if (arg === '-u' || arg === '--url') {
|
||||
if (i + 1 >= args.length) {
|
||||
console.error('Error: URL argument required for -u/--url option');
|
||||
process.exit(1);
|
||||
}
|
||||
apiUrl = args[i + 1];
|
||||
i++; // Skip next argument
|
||||
} else if (arg === '-h' || arg === '--help') {
|
||||
showUsage();
|
||||
process.exit(0);
|
||||
} else if (arg.startsWith('-')) {
|
||||
console.error(`Error: Unknown option ${arg}`);
|
||||
showUsage();
|
||||
process.exit(1);
|
||||
} else {
|
||||
if (jsonFile) {
|
||||
console.error('Error: Multiple JSON files specified');
|
||||
process.exit(1);
|
||||
}
|
||||
jsonFile = arg;
|
||||
}
|
||||
if (values.help) {
|
||||
showUsage();
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
if (!jsonFile) {
|
||||
if (positionals.length !== 1) {
|
||||
console.error('Error: JSON file required');
|
||||
showUsage();
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
return { apiUrl, jsonFile };
|
||||
return {
|
||||
apiUrl: values.url,
|
||||
apiKey: values.key || '',
|
||||
jsonFile: positionals[0]
|
||||
};
|
||||
}
|
||||
|
||||
async function validateJsonFile(jsonFile) {
|
||||
@@ -80,28 +74,84 @@ async function validateJsonFile(jsonFile) {
|
||||
}
|
||||
}
|
||||
|
||||
async function uploadData(apiUrl, jsonFile, jsonData) {
|
||||
console.log('Uploading sample data to JMESPath Playground...');
|
||||
console.log(`JSON file: ${jsonFile}`);
|
||||
console.log(`API URL: ${apiUrl}`);
|
||||
console.log('');
|
||||
|
||||
function isLocalhost(url) {
|
||||
try {
|
||||
const response = await fetch(`${apiUrl}/api/v1/upload`, {
|
||||
const parsed = new URL(url);
|
||||
const hostname = parsed.hostname;
|
||||
return hostname === 'localhost' ||
|
||||
hostname === '127.0.0.1' ||
|
||||
hostname.startsWith('127.') ||
|
||||
hostname === '::1';
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function makeRequest(url, options) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const parsedUrl = new URL(url);
|
||||
const isHttps = parsedUrl.protocol === 'https:';
|
||||
const client = isHttps ? https : http;
|
||||
|
||||
const requestOptions = {
|
||||
hostname: parsedUrl.hostname,
|
||||
port: parsedUrl.port,
|
||||
path: parsedUrl.pathname,
|
||||
method: options.method || 'GET',
|
||||
headers: options.headers || {}
|
||||
};
|
||||
|
||||
const req = client.request(requestOptions, (res) => {
|
||||
let data = '';
|
||||
res.on('data', chunk => data += chunk);
|
||||
res.on('end', () => {
|
||||
resolve({
|
||||
ok: res.statusCode >= 200 && res.statusCode < 300,
|
||||
status: res.statusCode,
|
||||
json: () => Promise.resolve(JSON.parse(data))
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
req.on('error', reject);
|
||||
|
||||
if (options.body) {
|
||||
req.write(options.body);
|
||||
}
|
||||
|
||||
req.end();
|
||||
});
|
||||
}
|
||||
|
||||
async function uploadData(apiUrl, apiKey, jsonFile, jsonData) {
|
||||
try {
|
||||
const headers = {
|
||||
'Content-Type': 'application/json',
|
||||
};
|
||||
|
||||
// Only send API key for non-localhost requests
|
||||
const isLocal = isLocalhost(apiUrl);
|
||||
if (!isLocal && apiKey) {
|
||||
headers['X-API-Key'] = apiKey;
|
||||
} else if (!isLocal && !apiKey) {
|
||||
console.error('Error: API key required for non-localhost URLs');
|
||||
console.error('Use -k/--key option to specify API key');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const response = await makeRequest(`${apiUrl}/api/v1/upload`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
headers: headers,
|
||||
body: jsonData
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP error! status: ${response.status}`);
|
||||
const errorData = await response.json().catch(() => ({}));
|
||||
throw new Error(`HTTP ${response.status}: ${errorData.error || 'Upload failed'}`);
|
||||
}
|
||||
|
||||
console.log('Sample data uploaded successfully!');
|
||||
console.log(`Open ${apiUrl} in your browser to see the reload button.`);
|
||||
console.log('You can then enter your JMESPath expression in the web interface.');
|
||||
const result = await response.json();
|
||||
console.log(JSON.stringify(result));
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error uploading data:', error.message);
|
||||
@@ -110,9 +160,9 @@ async function uploadData(apiUrl, jsonFile, jsonData) {
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const { apiUrl, jsonFile } = parseArguments();
|
||||
const { apiUrl, apiKey, jsonFile } = getArguments();
|
||||
const jsonData = await validateJsonFile(jsonFile);
|
||||
await uploadData(apiUrl, jsonFile, jsonData);
|
||||
await uploadData(apiUrl, apiKey, jsonFile, jsonData);
|
||||
}
|
||||
|
||||
// Run the script
|
||||
|
||||
@@ -22,15 +22,15 @@ try {
|
||||
console.log(`✅ Building release version ${version} (tagged: ${gitTag})`);
|
||||
isRelease = true;
|
||||
} else {
|
||||
// We're not at a tagged commit - add -dev suffix
|
||||
version = `${version}-dev`;
|
||||
console.log(`📦 Building development version ${version}`);
|
||||
// We're not at a tagged commit - use unknown version
|
||||
version = 'unknown';
|
||||
console.log(`📦 Building development version with unknown version`);
|
||||
isRelease = false;
|
||||
}
|
||||
} catch (error) {
|
||||
// Git command failed (maybe not in a git repo)
|
||||
version = `${version}-dev`;
|
||||
console.log(`⚠️ Cannot determine git status, using development version ${version}`);
|
||||
version = 'unknown';
|
||||
console.log(`⚠️ Cannot determine git status, using unknown version`);
|
||||
isRelease = false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user