prehistoric-systems/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-03-11 08:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chore: remove encrypting token since it should be editable and visible like envs

Browse source
This commit is contained in:
David Buday 2024-11-08 18:09:01 +01:00
parent 15653e645c
commit 5a1431cf84
2 changed files with 19 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/Jobs/ApplicationDeploymentJob.php
View file

@ -365,7 +365,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$dockerfile_base64 = base64_encode($this->application->dockerfile);
$this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name} to {$this->server->name}.");
$didLogin = $this->handleRegistryAuth();
$this->prepare_builder_image();
$this->execute_remote_command(
[
@ -393,29 +393,27 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
}
$this->application_deployment_queue->addLogEntry("Starting deployment of {$this->dockerImage}:{$this->dockerImageTag} to {$this->server->name}.");
// login
$didLogin = $this->handleRegistryAuth();
// login if use custom registry
if ($this->application->docker_use_custom_registry) {
$this->handleRegistryAuth();
}
$this->generate_image_names();
$this->prepare_builder_image();
$this->generate_compose_file();
$this->rolling_update();
// Logout if we logged in
if ($didLogin) {
// Logout if use custom registry
if ($this->application->docker_use_custom_registry) {
$this->application_deployment_queue->addLogEntry('Logging out from registry...');
$this->execute_remote_command([
'docker logout',
'hidden' => true
]);
}
// Continue with the rest of the deployment...
} catch (Exception $e) {
// Make sure to logout even if pull fails
if ($didLogin ?? false) {
// Make sure to logout even if build/pull fails
if ($this->application->docker_use_custom_registry) {
$this->execute_remote_command([
'docker logout',
'hidden' => true
@ -605,8 +603,6 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
private function deploy_dockerfile_buildpack()
{
// login
$didLogin = $this->handleRegistryAuth();
$this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch} to {$this->server->name}.");
if ($this->use_build_server) {
$this->server = $this->build_server;
@ -2481,30 +2477,18 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
private function handleRegistryAuth()
{
if ($this->application->docker_use_custom_registry) {
try {
$username = escapeshellarg($this->application->docker_registry_username);
$token = escapeshellarg(decrypt($this->application->docker_registry_token));
$username = escapeshellarg($this->application->docker_registry_username);
$token = escapeshellarg($this->application->docker_registry_token);
$registry = $this->application->docker_registry_url ?: 'docker.io'; // Default to docker.io
$registry = escapeshellarg($registry);
$registry = escapeshellarg($this->application->docker_registry_url ?: 'docker.io'); // Default to docker.io
$this->application_deployment_queue->addLogEntry('Attempting to log into registry...');
$this->application_deployment_queue->addLogEntry('Attempting to log into registry...');
$command = "echo {$token} | docker login {$registry} -u {$username} --password-stdin";
$this->application_deployment_queue->addLogEntry($command);
$command = "echo {$token} | docker login {$registry} -u {$username} --password-stdin";
$this->execute_remote_command([
$command,
'hidden' => true,
]);
return true;
} catch (Exception $e) {
$this->application_deployment_queue->addLogEntry('Registry authentication error: ' . $e->getMessage(), 'stderr');
throw $e;
}
}
return false;
$this->execute_remote_command([
$command,
'hidden' => true,
]);
}
}

2
app/Livewire/Project/New/DockerImage.php
View file

@ -85,7 +85,7 @@ class DockerImage extends Component
'docker_use_custom_registry' => $this->useCustomRegistry,
'docker_registry_url' => $this->registryUrl,
'docker_registry_username' => $this->registryUsername,
'docker_registry_token' => $this->registryToken ? encrypt($this->registryToken) : null,
'docker_registry_token' => $this->registryToken,
]);
$fqdn = generateFqdn($destination->server, $application->uuid);