mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #12555 from appwrite/feat/node-modules-cache-key
Add node modules cache key for builds
This commit is contained in:
6 files changed
+44
-13
No files matched your search
@@ -429,7 +429,7 @@ jobs:
|
||||
- name: Wait for Open Runtimes
|
||||
timeout-minutes: 3
|
||||
run: |
|
||||
while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
|
||||
while ! docker logs exc1 | grep -q "Executor is ready."; do
|
||||
echo "Waiting for Executor to come online"
|
||||
sleep 1
|
||||
done
|
||||
@@ -525,7 +525,7 @@ jobs:
|
||||
- name: Wait for Open Runtimes
|
||||
timeout-minutes: 3
|
||||
run: |
|
||||
while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
|
||||
while ! docker logs exc1 | grep -q "Executor is ready."; do
|
||||
echo "Waiting for Executor to come online"
|
||||
sleep 1
|
||||
done
|
||||
@@ -678,7 +678,7 @@ jobs:
|
||||
- name: Wait for Open Runtimes
|
||||
timeout-minutes: 3
|
||||
run: |
|
||||
while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
|
||||
while ! docker logs exc1 | grep -q "Executor is ready."; do
|
||||
echo "Waiting for Executor to come online"
|
||||
sleep 1
|
||||
done
|
||||
|
||||
@@ -983,12 +983,12 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
|
||||
- appwrite
|
||||
|
||||
openruntimes-executor:
|
||||
container_name: openruntimes-executor
|
||||
container_name: exc1
|
||||
hostname: exc1
|
||||
<<: *x-logging
|
||||
restart: unless-stopped
|
||||
stop_signal: SIGINT
|
||||
image: openruntimes/executor:0.11.4
|
||||
image: openruntimes/executor:0.24.1
|
||||
networks:
|
||||
- appwrite
|
||||
- runtimes
|
||||
@@ -1001,6 +1001,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
|
||||
# It's not possible to share mount file between 2 containers without host mount (copying is too slow)
|
||||
- /tmp:/tmp:rw
|
||||
environment:
|
||||
- OPR_EXECUTOR_CONNECTION_STORAGE=local://localhost
|
||||
- OPR_EXECUTOR_CONNECTION_BUILD_CACHE_STORAGE=
|
||||
- OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
|
||||
- OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
|
||||
- OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
|
||||
@@ -1209,3 +1211,4 @@ volumes:
|
||||
appwrite-sites:
|
||||
appwrite-builds:
|
||||
appwrite-config:
|
||||
openruntimes-node-modules-cache:
|
||||
+5
-2
@@ -1245,11 +1245,11 @@ services:
|
||||
- appwrite
|
||||
|
||||
openruntimes-executor:
|
||||
container_name: openruntimes-executor
|
||||
container_name: exc1
|
||||
hostname: exc1
|
||||
<<: *x-logging
|
||||
stop_signal: SIGINT
|
||||
image: openruntimes/executor:0.11.4
|
||||
image: openruntimes/executor:0.24.1
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- appwrite
|
||||
@@ -1263,6 +1263,8 @@ services:
|
||||
# It's not possible to share mount file between 2 containers without host mount (copying is too slow)
|
||||
- /tmp:/tmp:rw
|
||||
environment:
|
||||
- OPR_EXECUTOR_CONNECTION_STORAGE=local://localhost
|
||||
- OPR_EXECUTOR_CONNECTION_BUILD_CACHE_STORAGE=
|
||||
- OPR_EXECUTOR_IMAGE_PULL=enabled
|
||||
- OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
|
||||
- OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
|
||||
@@ -1525,3 +1527,4 @@ volumes:
|
||||
appwrite-builds:
|
||||
appwrite-config:
|
||||
appwrite-models:
|
||||
openruntimes-node-modules-cache:
|
||||
@@ -686,6 +686,11 @@ class Builds extends Action
|
||||
deployment: $deployment
|
||||
);
|
||||
|
||||
$cacheKey = $this->getNodeModulesCacheKey($project, $resource, $runtime, $version, $command);
|
||||
|
||||
Span::add('build.node_modules_cache.enabled', $cacheKey !== '');
|
||||
Span::add('build.node_modules_cache.key', $cacheKey);
|
||||
|
||||
$response = null;
|
||||
$err = null;
|
||||
|
||||
@@ -699,7 +704,7 @@ class Builds extends Action
|
||||
$span = Span::current();
|
||||
|
||||
Co::join([
|
||||
Co\go(function () use ($executor, &$response, $project, $deployment, $source, $resource, $runtime, $vars, $command, $cpus, $memory, $timeout, &$err, $version, $span) {
|
||||
Co\go(function () use ($executor, &$response, $project, $deployment, $source, $resource, $runtime, $vars, $command, $cacheKey, $cpus, $memory, $timeout, &$err, $version, $span) {
|
||||
try {
|
||||
if ($version === 'v2') {
|
||||
$command = 'tar -zxf /tmp/code.tar.gz -C /usr/code && cd /usr/local/src/ && ./build.sh';
|
||||
@@ -726,7 +731,8 @@ class Builds extends Action
|
||||
destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
|
||||
variables: $vars,
|
||||
command: $command,
|
||||
outputDirectory: $outputDirectory ?? ''
|
||||
outputDirectory: $outputDirectory ?? '',
|
||||
cacheKey: $cacheKey
|
||||
);
|
||||
|
||||
} catch (ExecutorTimeout $error) {
|
||||
@@ -1315,6 +1321,23 @@ class Builds extends Action
|
||||
return '';
|
||||
}
|
||||
|
||||
protected function getNodeModulesCacheKey(Document $project, Document $resource, array $runtime, string $version, string $command): string
|
||||
{
|
||||
if ($version !== 'v5' || $command === '' || $command === '0') {
|
||||
return '';
|
||||
}
|
||||
|
||||
$hashContext = [
|
||||
'version' => 'v1',
|
||||
'projectId' => $project->getId(),
|
||||
'resourceType' => $resource->getCollection(),
|
||||
'resourceId' => $resource->getId(),
|
||||
'runtime' => $runtime['image'] ?? '',
|
||||
];
|
||||
|
||||
return \substr(\hash('sha256', \json_encode($hashContext, JSON_THROW_ON_ERROR)), 0, 48);
|
||||
}
|
||||
|
||||
protected function prepareSiteBuildCommand(string $command, string $outputDirectory): string
|
||||
{
|
||||
$listFilesCommand = 'echo "{APPWRITE_DETECTION_SEPARATOR_START}" && cd /usr/local/build';
|
||||
|
||||
@@ -71,7 +71,8 @@ class Executor
|
||||
array $variables = [],
|
||||
?string $command = null,
|
||||
string $outputDirectory = '',
|
||||
string $runtimeEntrypoint = ''
|
||||
string $runtimeEntrypoint = '',
|
||||
string $cacheKey = ''
|
||||
) {
|
||||
$runtimeId = "$projectId-$deploymentId-build";
|
||||
$route = "/runtimes";
|
||||
@@ -95,7 +96,8 @@ class Executor
|
||||
'version' => $version,
|
||||
'timeout' => $timeout,
|
||||
'outputDirectory' => $outputDirectory,
|
||||
'runtimeEntrypoint' => $runtimeEntrypoint
|
||||
'runtimeEntrypoint' => $runtimeEntrypoint,
|
||||
'cacheKey' => $cacheKey
|
||||
];
|
||||
|
||||
|
||||
|
||||
@@ -72,11 +72,11 @@ trait SitesBase
|
||||
throw new Critical('Deployment failed: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
|
||||
}
|
||||
|
||||
$code = Console::execute("docker inspect openruntimes-executor --format='{{.State.ExitCode}}'", '', $this->stdout, $this->stderr);
|
||||
$code = Console::execute("docker inspect exc1 --format='{{.State.ExitCode}}'", '', $this->stdout, $this->stderr);
|
||||
if ($code === 0 && \trim($this->stdout) !== '' && \trim($this->stdout) !== '0') {
|
||||
$msg = 'Executor has a problem: ' . $this->stderr . ' (' . $this->stdout . '), current status: ';
|
||||
|
||||
Console::execute("docker compose logs openruntimes-executor", '', $this->stdout, $this->stderr);
|
||||
Console::execute("docker logs exc1", '', $this->stdout, $this->stderr);
|
||||
$msg .= $this->stdout . ' (' . $this->stderr . ')';
|
||||
|
||||
throw new Critical($msg . json_encode($deployment['body'], JSON_PRETTY_PRINT));
|
||||
|
||||
Reference in new issue
Block a user