Skip to content

Commit 62ae14b

Browse files
authored
Merge pull request #28 from not-empty/feature/composition-api-ts
Feature/composition api ts
2 parents eb289fa + 9bc5e9f commit 62ae14b

File tree

108 files changed

+5615
-4579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+5615
-4579
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ docker exec -it taurus-manager-back bash
8181
```
8282

8383
```sh
84-
npm ts-node scanQueues.ts taurus-redis
84+
npx ts-node scanQueues.ts taurus-redis
8585
```
8686

8787
### Login And Use

backend/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ RUN npm run build
99
FROM kiwfydev/node-clear-linux
1010
WORKDIR /app
1111
COPY --from=build ./app/node_modules ./node_modules
12-
COPY --from=build ./app/build ./build
12+
COPY --from=build ./app/build ./
1313
COPY --from=build ./app/package.json .
14-
COPY --from=build ./app/ormconfig.prod.js ./ormconfig.js
15-
EXPOSE 80
14+
EXPOSE 3333
1615
CMD ["npm","start"]

backend/knexfile.ts

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import type { Knex } from 'knex';
2+
import {
3+
DB_DATABASE,
4+
DB_HOST,
5+
DB_PASSWORD,
6+
DB_PORT,
7+
DB_USERNAME,
8+
} from './src/config/db';
9+
10+
const config: { [key: string]: Knex.Config } = {
11+
development: {
12+
client: 'mysql',
13+
connection: {
14+
host: DB_HOST,
15+
port: DB_PORT,
16+
user: DB_USERNAME,
17+
password: DB_PASSWORD,
18+
database: DB_DATABASE,
19+
},
20+
migrations: {
21+
tableName: 'migrations',
22+
directory: './src/database/migrations',
23+
},
24+
},
25+
26+
staging: {
27+
client: 'mysql',
28+
connection: {
29+
host: DB_HOST,
30+
port: DB_PORT,
31+
user: DB_USERNAME,
32+
password: DB_PASSWORD,
33+
database: DB_DATABASE,
34+
},
35+
migrations: {
36+
tableName: 'migrations',
37+
directory: './src/database/migrations',
38+
},
39+
},
40+
production: {
41+
client: 'mysql',
42+
connection: {
43+
host: DB_HOST,
44+
port: DB_PORT,
45+
user: DB_USERNAME,
46+
password: DB_PASSWORD,
47+
database: DB_DATABASE,
48+
},
49+
migrations: {
50+
tableName: 'migrations',
51+
directory: './src/database/migrations',
52+
},
53+
},
54+
};
55+
56+
export default config;

backend/ops/docker/prod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ WORKDIR /app
1111
COPY --from=build ./app/node_modules ./node_modules
1212
COPY --from=build ./app/build ./build
1313
COPY --from=build ./app/package.json .
14-
COPY --from=build ./app/ormconfig.prod.js ./ormconfig.js
14+
COPY --from=build ./app/.env .
1515
EXPOSE 3333
1616
CMD ["npm","start"]

backend/ormconfig.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)