Skip to content

Commit c140e42

Browse files
fix: issues in creating project
1 parent 0e7f838 commit c140e42

File tree

10 files changed

+24
-21
lines changed

10 files changed

+24
-21
lines changed

app/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN apk update && apk add git
1616
COPY --from=builder /app/dist /server/dist
1717
COPY --from=builder /app/node_modules /server/node_modules
1818
COPY --from=builder /app/protobufs /server/protobufs
19-
19+
RUN mkdir "/server/workdir"
2020
ENV NODE_ENV=production
2121
EXPOSE 5000
2222
CMD [ "node", "dist/src/app.js" ]

app/devspace.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ deployments:
4646
value: development
4747
- name: COMPAGE_CORE_URL
4848
value: ${COMPAGE_CORE_URL}
49+
- name: LOG_LEVEL
50+
value: debug
4951
service:
5052
ports:
5153
- port: 5000

app/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/integrations/git-platforms/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const createRepository = async (projectEntity: ProjectEntity) => {
2323
};
2424

2525
export const makeInitialCommit = async (projectEntity: ProjectEntity) => {
26-
const createdProjectPath = `/tmp/${projectEntity.id}`;
26+
const createdProjectPath = `/server/workdir/${projectEntity.id}`;
2727
fs.mkdirSync(createdProjectPath, {recursive: true});
2828
fs.writeFileSync(`${createdProjectPath}/README.md`, `# ${projectEntity.repository_name}`);
2929
const gitPlatform: GitPlatformEntity = await gitPlatformService.getGitPlatform(projectEntity.owner_email, projectEntity.git_platform_name);
@@ -46,5 +46,5 @@ export const makeInitialCommit = async (projectEntity: ProjectEntity) => {
4646
throw new Error(error);
4747
}
4848
// delete the project from temp folder once it's pushed to git server.
49-
fs.rmSync(createdProjectPath, {recursive: true});
49+
// fs.rmSync(createdProjectPath, {recursive: true});
5050
};

app/src/integrations/simple-git/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const gitOperations = async (git: SimpleGit, repositoryBranch?: string, p
3737

3838
let branchName: string = '';
3939
if (!repositoryBranch && !projectVersion) {
40-
branchName = 'main';
40+
branchName = 'master';
4141
} else {
4242
branchName = repositoryBranch + '-' + projectVersion;
4343
}

app/src/integrations/simple-git/newProject.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,30 @@ export const pushNewProjectToGitServer = async (newProjectGitServerRequest: NewP
1919
// initialize git
2020
await git.init().then(
2121
(success: any) => {
22-
Logger.debug(`git init succeeded: ${success}`);
22+
Logger.debug(`git init succeeded: ${JSON.stringify(success)}`);
2323
}, (failure: any) => {
24-
Logger.debug(`git init failed: ${failure}`);
25-
error = `git init failed: ${failure}`;
24+
Logger.debug(`git init failed: ${JSON.stringify(failure)}`);
25+
error = `git init failed: ${JSON.stringify(failure)}`;
2626
});
2727
if (error.length > 0) {
2828
return error;
2929
}
30+
Logger.debug('git init done');
31+
3032
// add local git config like username and email
3133
await git.addConfig('user.email', newProjectGitServerRequest.gitProviderDetails.platformEmail);
3234
await git.addConfig('user.name', newProjectGitServerRequest.gitProviderDetails.platformUserName);
3335

34-
// TODO when the support for other git providers will be added, need to change below hardcoded string.
3536
// Set up GitHub url like this so no manual entry of user pass needed
3637
const gitServerUrl = `https://${newProjectGitServerRequest.gitProviderDetails.platformUserName}:${newProjectGitServerRequest.gitProviderDetails.platformPersonalAccessToken}@${newProjectGitServerRequest.gitProviderDetails.platformUrl.replace('https://', '')}/${newProjectGitServerRequest.gitProviderDetails.platformUserName}/${newProjectGitServerRequest.gitProviderDetails.repositoryName}.git`;
3738

3839
// Add remote repository url as origin to repository
3940
await git.addRemote('origin', gitServerUrl).then(
4041
(success: any) => {
41-
Logger.debug(`git remote add origin succeeded: ${success}`);
42+
Logger.debug(`git remote add origin succeeded: ${JSON.stringify(success)}`);
4243
}, (failure: any) => {
43-
Logger.debug(`git remote add origin failed: ${failure}`);
44-
error = `git remote add origin failed: ${failure}`;
44+
Logger.debug(`git remote add origin failed: ${JSON.stringify(failure)}`);
45+
error = `git remote add origin failed: ${JSON.stringify(failure)}`;
4546
});
4647
if (error.length > 0) {
4748
return error;

charts/compage/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ ui:
118118
# Overrides the image tag whose default is the chart appVersion.
119119
tag: v1.0.0
120120
nameOverride: "ui"
121-
fullnameOverride: """"
121+
fullnameOverride: ""
122122
ingress:
123123
enabled: false
124124
className: ""

deploy/build-docker-images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#######################################################################
22
# create and push docker images #
33
#######################################################################
4-
TAG_NAME="v2"
4+
TAG_NAME="v2Next"
55
CORE_IMAGE="ghcr.io/intelops/compage/core:$TAG_NAME"
66
APP_IMAGE="ghcr.io/intelops/compage/app:$TAG_NAME"
77
UI_IMAGE="ghcr.io/intelops/compage/ui:$TAG_NAME"

deploy/steps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ kubens compage
3131
./build-docker-images.sh
3232

3333
### Load docker images into kind cluster
34-
kind load docker-image --name compage ghcr.io/intelops/compage/app:nextv2
35-
kind load docker-image --name compage ghcr.io/intelops/compage/core:nextv2
36-
kind load docker-image --name compage ghcr.io/intelops/compage/ui:nextv2
34+
kind load docker-image --name compage ghcr.io/intelops/compage/app:v1Next
35+
kind load docker-image --name compage ghcr.io/intelops/compage/core:v1Next
36+
kind load docker-image --name compage ghcr.io/intelops/compage/ui:v1Next
3737

3838
### Update image tags and cassandra password in values.yaml
3939
### Install compage helm chart from compage root directory

0 commit comments

Comments
 (0)