Skip to content

Commit

Permalink
feat/pipeline: update project abbreviation name; temporary disabled o…
Browse files Browse the repository at this point in the history
…racle connection in backend
  • Loading branch information
catherine meng authored and catherine meng committed Jul 18, 2022
1 parent eff3401 commit 1ddc601
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/openshift/deploy.backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ metadata:
name: ${NAME}
annotations:
description: "Nr-Old-Growth"
tags: "nrfl"
tags: "nrfc"
iconClass: icon-js
labels:
app: ${NAME}-${ZONE}
app.kubernetes.io/part-of: ${NAME}-${ZONE}
parameters:
- name: NAME
description: Module name
value: nrfl
value: nrfc
- name: COMPONENT
description: Component name
value: backend
Expand Down
4 changes: 2 additions & 2 deletions .github/openshift/deploy.database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ metadata:
name: ${NAME}
annotations:
description: "Nr-Old-Growth"
tags: "nrfl"
tags: "nrfc"
iconClass: icon-js
labels:
app: ${NAME}-${ZONE}
app.kubernetes.io/part-of: ${NAME}-${ZONE}
parameters:
- name: NAME
description: Product name
value: nrfl
value: nrfc
- name: COMPONENT
description: Component name
value: database
Expand Down
4 changes: 2 additions & 2 deletions .github/openshift/deploy.frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ metadata:
name: ${NAME}
annotations:
description: "Nr-Old-Growth"
tags: "nrfl"
tags: "nrfc"
iconClass: icon-js
labels:
app: ${NAME}-${ZONE}
app.kubernetes.io/part-of: ${NAME}-${ZONE}
parameters:
- name: NAME
description: Module name
value: nrfl
value: nrfc
- name: COMPONENT
description: Component name
value: frontend
Expand Down
2 changes: 1 addition & 1 deletion .github/openshift/networkPolicies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: ${NAME}
annotations:
description: "NR-Forest-Client"
tags: "nrfl"
tags: "nrfc"
iconClass: icon-js
objects:
- apiVersion: networking.k8s.io/v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
REGISTRY: ghcr.io
NAME: nrfl
NAME: nrfc

jobs:
codeql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
REGISTRY: ghcr.io
NAME: nrfl
NAME: nrfc

jobs:
codeql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- dev

env:
NAME: nrfl
NAME: nrfc

jobs:
cleanup-openshift:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
REGISTRY: ghcr.io
NAME: nrfl
NAME: nrfc

jobs:
check-backend:
Expand Down
24 changes: 12 additions & 12 deletions backend/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ import { ClientPublicModule } from './clientpublic/clientPublic.module';
@Module({
imports: [
ConfigModule.forRoot(),
TypeOrmModule.forRoot({
type: 'oracle',
host: process.env.ORACLEDB_HOST || 'localhost',
port: 1521,
serviceName: process.env.ORACLEDB_SERVICENAME,
database: process.env.ORACLEDB_DATABASE || 'postgres',
username: process.env.ORACLEDB_USER || 'postgres',
password: process.env.ORACLEDB_PASSWORD,
autoLoadEntities: true, // Auto load all entities regiestered by typeorm forFeature method.
synchronize: false, // This changes the DB schema to match changes to entities, which we might not want.
}),
ClientPublicModule,
// TypeOrmModule.forRoot({
// type: 'oracle',
// host: process.env.ORACLEDB_HOST || 'localhost',
// port: 1521,
// serviceName: process.env.ORACLEDB_SERVICENAME,
// database: process.env.ORACLEDB_DATABASE || 'postgres',
// username: process.env.ORACLEDB_USER || 'postgres',
// password: process.env.ORACLEDB_PASSWORD,
// autoLoadEntities: true, // Auto load all entities regiestered by typeorm forFeature method.
// synchronize: false, // This changes the DB schema to match changes to entities, which we might not want.
// }),
// ClientPublicModule,
],
controllers: [AppController],
providers: [AppService],
Expand Down

0 comments on commit 1ddc601

Please sign in to comment.