mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
refactor: simplify comparison docker tags
This commit is contained in:
@@ -37,15 +37,19 @@ export default async function handler(
|
|||||||
const sourceType = application.sourceType;
|
const sourceType = application.sourceType;
|
||||||
|
|
||||||
if (sourceType === "docker") {
|
if (sourceType === "docker") {
|
||||||
const applicationDockerTag = extractImageTagFromApplication(application.dockerImage);
|
const applicationDockerTag = extractImageTag(application.dockerImage);
|
||||||
if (applicationDockerTag) {
|
const webhookDockerTag = extractImageTagFromRequest(
|
||||||
const webhookDockerTag = extractImageTagFromRequestEventPayload(req.headers, req.body);
|
req.headers,
|
||||||
if (webhookDockerTag && (webhookDockerTag !== applicationDockerTag)) {
|
req.body,
|
||||||
res.status(301).json({
|
);
|
||||||
message: `Application Image Tag(${applicationDockerTag}) doesn't match request event payload Image Tag(${webhookDockerTag}).`
|
if (
|
||||||
});
|
applicationDockerTag &&
|
||||||
return;
|
webhookDockerTag &&
|
||||||
}
|
webhookDockerTag !== applicationDockerTag
|
||||||
|
) {
|
||||||
|
return res.status(301).json({
|
||||||
|
message: `Application Image Tag (${applicationDockerTag}) doesn't match request event payload Image Tag (${webhookDockerTag}).`,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (sourceType === "github") {
|
else if (sourceType === "github") {
|
||||||
@@ -101,23 +105,19 @@ export default async function handler(
|
|||||||
* Example: "myregistryhost:5000/fedora/httpd:version1.0" => "version1.0"
|
* Example: "myregistryhost:5000/fedora/httpd:version1.0" => "version1.0"
|
||||||
* @link https://docs.docker.com/reference/cli/docker/image/tag/
|
* @link https://docs.docker.com/reference/cli/docker/image/tag/
|
||||||
*/
|
*/
|
||||||
function extractImageTagFromApplication(dockerImage: string | null) {
|
function extractImageTag(dockerImage: string | null) {
|
||||||
if (!dockerImage || typeof dockerImage !== "string") {
|
if (!dockerImage || typeof dockerImage !== "string") {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const partsOfDockerImageName = dockerImage.split(':')
|
const tag = dockerImage.split(":").pop();
|
||||||
if (partsOfDockerImageName.length === 1) {
|
return tag === dockerImage ? "latest" : tag;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return partsOfDockerImageName[partsOfDockerImageName.length - 1];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @link https://docs.docker.com/docker-hub/webhooks/#example-webhook-payload
|
* @link https://docs.docker.com/docker-hub/webhooks/#example-webhook-payload
|
||||||
*/
|
*/
|
||||||
function extractImageTagFromRequestEventPayload(headers: any, body: any) {
|
function extractImageTagFromRequest(headers: any, body: any): string | null {
|
||||||
if (headers["user-agent"]?.includes("Go-http-client")) {
|
if (headers["user-agent"]?.includes("Go-http-client")) {
|
||||||
if (body.push_data && body.repository) {
|
if (body.push_data && body.repository) {
|
||||||
return body.push_data.tag;
|
return body.push_data.tag;
|
||||||
|
|||||||
Reference in New Issue
Block a user