Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Quick fix for Docker files

Browse Source
This commit is contained in:
Andras Bacsai 2021-04-19 13:08:17 +02:00
parent 142b83cc13
commit f742c2a3e2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/buildPacks/helpers.js
View File

@ -4,9 +4,9 @@ const buildImageNodeDocker = (configuration) => {
return [ return [
'FROM node:lts', 'FROM node:lts',
'WORKDIR /usr/src/app', 'WORKDIR /usr/src/app',
`COPY ${configuration.build.directory}/package*.json .`, `COPY ${configuration.build.directory}/package*.json ./`,
configuration.build.command.installation && `RUN ${configuration.build.command.installation}`, configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
`COPY ./${configuration.build.directory} .`, `COPY ./${configuration.build.directory} ./`,
`RUN ${configuration.build.command.build}` `RUN ${configuration.build.command.build}`
].join('\n') ].join('\n')
} }

6
api/buildPacks/nodejs/index.js
View File

@ -7,11 +7,11 @@ const publishNodejsDocker = (configuration) => {
'FROM node:lts', 'FROM node:lts',
'WORKDIR /usr/src/app', 'WORKDIR /usr/src/app',
configuration.build.command.build configuration.build.command.build
? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} .` ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
: ` : `
COPY ${configuration.build.directory}/package*.json . COPY ${configuration.build.directory}/package*.json ./
RUN ${configuration.build.command.installation} RUN ${configuration.build.command.installation}
COPY ./${configuration.build.directory} .`, COPY ./${configuration.build.directory} ./`,
`EXPOSE ${configuration.publish.port}`, `EXPOSE ${configuration.publish.port}`,
'CMD [ "yarn", "start" ]' 'CMD [ "yarn", "start" ]'
].join('\n') ].join('\n')

4
api/buildPacks/static/index.js
View File

@ -9,8 +9,8 @@ const publishStaticDocker = (configuration) => {
'COPY nginx.conf /etc/nginx/nginx.conf', 'COPY nginx.conf /etc/nginx/nginx.conf',
'WORKDIR /usr/share/nginx/html', 'WORKDIR /usr/share/nginx/html',
configuration.build.command.build configuration.build.command.build
? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} .` ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
: `COPY ./${configuration.build.directory} .`, : `COPY ./${configuration.build.directory} ./`,
'EXPOSE 80', 'EXPOSE 80',
'CMD ["nginx", "-g", "daemon off;"]' 'CMD ["nginx", "-g", "daemon off;"]'
].join('\n') ].join('\n')

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "coolify", "name": "coolify",
"description": "An open-source, hassle-free, self-hostable Heroku & Netlify alternative.", "description": "An open-source, hassle-free, self-hostable Heroku & Netlify alternative.",
"version": "1.0.7", "version": "1.0.8",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
"lint": "standard", "lint": "standard",