diff --git a/apps/api/src/lib/buildPacks/gatsby.ts b/apps/api/src/lib/buildPacks/gatsby.ts index d133fd084..f319d106f 100644 --- a/apps/api/src/lib/buildPacks/gatsby.ts +++ b/apps/api/src/lib/buildPacks/gatsby.ts @@ -9,6 +9,7 @@ const createDockerfile = async (data, imageforBuild): Promise => { Dockerfile.push('WORKDIR /app'); Dockerfile.push(`LABEL coolify.buildId=${buildId}`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); if (baseImage?.includes('nginx')) { Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`); } diff --git a/apps/api/src/lib/buildPacks/laravel.ts b/apps/api/src/lib/buildPacks/laravel.ts index 159e8d9ca..e1b74e722 100644 --- a/apps/api/src/lib/buildPacks/laravel.ts +++ b/apps/api/src/lib/buildPacks/laravel.ts @@ -30,6 +30,7 @@ const createDockerfile = async (data, image): Promise => { `COPY --chown=application:application --from=${applicationId}:${tag}-cache /app/mix-manifest.json /app/public/mix-manifest.json` ); Dockerfile.push(`COPY --chown=application:application . ./`); + Dockerfile.push('RUN rm -fr .git'); Dockerfile.push(`EXPOSE ${port}`); await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n')); }; diff --git a/apps/api/src/lib/buildPacks/nestjs.ts b/apps/api/src/lib/buildPacks/nestjs.ts index ba98b70ef..38f8a1cae 100644 --- a/apps/api/src/lib/buildPacks/nestjs.ts +++ b/apps/api/src/lib/buildPacks/nestjs.ts @@ -13,7 +13,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); - + Dockerfile.push('RUN rm -fr .git'); Dockerfile.push(`EXPOSE ${port}`); Dockerfile.push(`CMD ${startCommand}`); await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n')); diff --git a/apps/api/src/lib/buildPacks/nextjs.ts b/apps/api/src/lib/buildPacks/nextjs.ts index af6172c74..38f6a9dc8 100644 --- a/apps/api/src/lib/buildPacks/nextjs.ts +++ b/apps/api/src/lib/buildPacks/nextjs.ts @@ -43,6 +43,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`); } Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); Dockerfile.push(`EXPOSE 80`); } diff --git a/apps/api/src/lib/buildPacks/node.ts b/apps/api/src/lib/buildPacks/node.ts index 8ccfcc68e..84b6b7fb6 100644 --- a/apps/api/src/lib/buildPacks/node.ts +++ b/apps/api/src/lib/buildPacks/node.ts @@ -29,6 +29,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7'); } Dockerfile.push(`COPY .${baseDirectory || ''} ./`); + Dockerfile.push('RUN rm -fr .git'); Dockerfile.push(`RUN ${installCommand}`); if (buildCommand) { Dockerfile.push(`RUN ${buildCommand}`); diff --git a/apps/api/src/lib/buildPacks/nuxtjs.ts b/apps/api/src/lib/buildPacks/nuxtjs.ts index af6172c74..38f6a9dc8 100644 --- a/apps/api/src/lib/buildPacks/nuxtjs.ts +++ b/apps/api/src/lib/buildPacks/nuxtjs.ts @@ -43,6 +43,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`); } Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); Dockerfile.push(`EXPOSE 80`); } diff --git a/apps/api/src/lib/buildPacks/react.ts b/apps/api/src/lib/buildPacks/react.ts index 27cf8718b..f869144f6 100644 --- a/apps/api/src/lib/buildPacks/react.ts +++ b/apps/api/src/lib/buildPacks/react.ts @@ -9,6 +9,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push(`LABEL coolify.buildId=${buildId}`); Dockerfile.push('WORKDIR /app'); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); if (baseImage?.includes('nginx')) { Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`); } diff --git a/apps/api/src/lib/buildPacks/rust.ts b/apps/api/src/lib/buildPacks/rust.ts index 931a4524a..038dacb9c 100644 --- a/apps/api/src/lib/buildPacks/rust.ts +++ b/apps/api/src/lib/buildPacks/rust.ts @@ -20,6 +20,7 @@ const createDockerfile = async (data, image, name): Promise => { ); Dockerfile.push(`RUN update-ca-certificates`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/target/release/${name} ${name}`); + Dockerfile.push('RUN rm -fr .git'); Dockerfile.push(`EXPOSE ${port}`); Dockerfile.push(`CMD ["/app/${name}"]`); await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n')); diff --git a/apps/api/src/lib/buildPacks/static.ts b/apps/api/src/lib/buildPacks/static.ts index def989fc9..9ab4c8a1b 100644 --- a/apps/api/src/lib/buildPacks/static.ts +++ b/apps/api/src/lib/buildPacks/static.ts @@ -32,6 +32,7 @@ const createDockerfile = async (data, image): Promise => { } if (buildCommand) { Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); } else { Dockerfile.push(`COPY .${baseDirectory || ''} ./`); } diff --git a/apps/api/src/lib/buildPacks/svelte.ts b/apps/api/src/lib/buildPacks/svelte.ts index a69eccd97..6fc4ceb13 100644 --- a/apps/api/src/lib/buildPacks/svelte.ts +++ b/apps/api/src/lib/buildPacks/svelte.ts @@ -9,6 +9,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push('WORKDIR /app'); Dockerfile.push(`LABEL coolify.buildId=${buildId}`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); if (baseImage?.includes('nginx')) { Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`); } diff --git a/apps/api/src/lib/buildPacks/vuejs.ts b/apps/api/src/lib/buildPacks/vuejs.ts index a69eccd97..6fc4ceb13 100644 --- a/apps/api/src/lib/buildPacks/vuejs.ts +++ b/apps/api/src/lib/buildPacks/vuejs.ts @@ -9,6 +9,7 @@ const createDockerfile = async (data, image): Promise => { Dockerfile.push('WORKDIR /app'); Dockerfile.push(`LABEL coolify.buildId=${buildId}`); Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`); + Dockerfile.push('RUN rm -fr .git'); if (baseImage?.includes('nginx')) { Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`); } diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts index f2461c48e..d39a33064 100644 --- a/apps/api/src/routes/webhooks/traefik/handlers.ts +++ b/apps/api/src/routes/webhooks/traefik/handlers.ts @@ -580,7 +580,6 @@ export async function proxyConfiguration(request: FastifyRequest, remote const isWWW = fqdn.includes('www.'); const isCustomSSL = false; const serviceId = `${oneService}-${port || 'default'}`; - console.log(port) traefik.http.routers = { ...traefik.http.routers, ...generateRouters(