From 160412f6e49854ce7815b8a0b00f6c70fa44020d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 28 Feb 2022 10:09:34 +0100 Subject: [PATCH] fix: Add coolify-image label for build images --- src/lib/buildPacks/gatsby.ts | 1 + src/lib/buildPacks/nestjs.ts | 1 + src/lib/buildPacks/nextjs.ts | 1 + src/lib/buildPacks/node.ts | 1 + src/lib/buildPacks/nuxtjs.ts | 1 + src/lib/buildPacks/php.ts | 1 + src/lib/buildPacks/react.ts | 1 + src/lib/buildPacks/rust.ts | 1 + src/lib/buildPacks/static.ts | 1 + src/lib/buildPacks/svelte.ts | 1 + src/lib/buildPacks/vuejs.ts | 1 + src/lib/docker.ts | 1 + 12 files changed, 12 insertions(+) diff --git a/src/lib/buildPacks/gatsby.ts b/src/lib/buildPacks/gatsby.ts index fd1495995..9f2685ff0 100644 --- a/src/lib/buildPacks/gatsby.ts +++ b/src/lib/buildPacks/gatsby.ts @@ -7,6 +7,7 @@ const createDockerfile = async (data, imageforBuild): Promise => { Dockerfile.push(`FROM ${imageforBuild}`); Dockerfile.push('WORKDIR /usr/share/nginx/html'); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`); Dockerfile.push(`EXPOSE 80`); Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]'); diff --git a/src/lib/buildPacks/nestjs.ts b/src/lib/buildPacks/nestjs.ts index 0a8bf9f38..38ef3bce1 100644 --- a/src/lib/buildPacks/nestjs.ts +++ b/src/lib/buildPacks/nestjs.ts @@ -7,6 +7,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/src/app'); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push( `COPY --from=${applicationId}:${tag}-cache /usr/src/app/${baseDirectory || ''} ./` ); diff --git a/src/lib/buildPacks/nextjs.ts b/src/lib/buildPacks/nextjs.ts index 648208d83..15e6dacca 100644 --- a/src/lib/buildPacks/nextjs.ts +++ b/src/lib/buildPacks/nextjs.ts @@ -16,6 +16,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/src/app'); + Dockerfile.push(`LABEL coolify.image=true`); if (secrets.length > 0) { secrets.forEach((secret) => { if (secret.isBuildSecret) { diff --git a/src/lib/buildPacks/node.ts b/src/lib/buildPacks/node.ts index 648208d83..15e6dacca 100644 --- a/src/lib/buildPacks/node.ts +++ b/src/lib/buildPacks/node.ts @@ -16,6 +16,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/src/app'); + Dockerfile.push(`LABEL coolify.image=true`); if (secrets.length > 0) { secrets.forEach((secret) => { if (secret.isBuildSecret) { diff --git a/src/lib/buildPacks/nuxtjs.ts b/src/lib/buildPacks/nuxtjs.ts index 648208d83..15e6dacca 100644 --- a/src/lib/buildPacks/nuxtjs.ts +++ b/src/lib/buildPacks/nuxtjs.ts @@ -16,6 +16,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/src/app'); + Dockerfile.push(`LABEL coolify.image=true`); if (secrets.length > 0) { secrets.forEach((secret) => { if (secret.isBuildSecret) { diff --git a/src/lib/buildPacks/php.ts b/src/lib/buildPacks/php.ts index 9bb345dec..64ac6a141 100644 --- a/src/lib/buildPacks/php.ts +++ b/src/lib/buildPacks/php.ts @@ -6,6 +6,7 @@ const createDockerfile = async (data, image): Promise => { const Dockerfile: Array = []; Dockerfile.push(`FROM ${image}`); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push('RUN a2enmod rewrite'); Dockerfile.push('WORKDIR /var/www/html'); Dockerfile.push(`COPY ./${baseDirectory || ''} /var/www/html`); diff --git a/src/lib/buildPacks/react.ts b/src/lib/buildPacks/react.ts index 859544281..5db9c33b2 100644 --- a/src/lib/buildPacks/react.ts +++ b/src/lib/buildPacks/react.ts @@ -6,6 +6,7 @@ const createDockerfile = async (data, image): Promise => { const Dockerfile: Array = []; Dockerfile.push(`FROM ${image}`); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push('WORKDIR /usr/share/nginx/html'); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`); Dockerfile.push(`EXPOSE 80`); diff --git a/src/lib/buildPacks/rust.ts b/src/lib/buildPacks/rust.ts index 0af47c44c..49eb59815 100644 --- a/src/lib/buildPacks/rust.ts +++ b/src/lib/buildPacks/rust.ts @@ -8,6 +8,7 @@ const createDockerfile = async (data, image, name): Promise => { const Dockerfile: Array = []; Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/src/app'); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/target target`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/local/cargo /usr/local/cargo`); Dockerfile.push(`COPY . .`); diff --git a/src/lib/buildPacks/static.ts b/src/lib/buildPacks/static.ts index d71eea6e1..f9fa4ee96 100644 --- a/src/lib/buildPacks/static.ts +++ b/src/lib/buildPacks/static.ts @@ -16,6 +16,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/share/nginx/html'); + Dockerfile.push(`LABEL coolify.image=true`); if (secrets.length > 0) { secrets.forEach((secret) => { if (secret.isBuildSecret) { diff --git a/src/lib/buildPacks/svelte.ts b/src/lib/buildPacks/svelte.ts index 9a730eb63..3ce957a1b 100644 --- a/src/lib/buildPacks/svelte.ts +++ b/src/lib/buildPacks/svelte.ts @@ -7,6 +7,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/share/nginx/html'); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`); Dockerfile.push(`EXPOSE 80`); Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]'); diff --git a/src/lib/buildPacks/vuejs.ts b/src/lib/buildPacks/vuejs.ts index 859544281..f88f4ac2a 100644 --- a/src/lib/buildPacks/vuejs.ts +++ b/src/lib/buildPacks/vuejs.ts @@ -7,6 +7,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`FROM ${image}`); Dockerfile.push('WORKDIR /usr/share/nginx/html'); + Dockerfile.push(`LABEL coolify.image=true`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`); Dockerfile.push(`EXPOSE 80`); Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]'); diff --git a/src/lib/docker.ts b/src/lib/docker.ts index b3cf89e37..477491f12 100644 --- a/src/lib/docker.ts +++ b/src/lib/docker.ts @@ -19,6 +19,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) { const Dockerfile: Array = []; Dockerfile.push(`FROM ${imageForBuild}`); Dockerfile.push('WORKDIR /usr/src/app'); + Dockerfile.push(`LABEL coolify.image=true`); if (secrets.length > 0) { secrets.forEach((secret) => { if (secret.isBuildSecret) {