Skip to content

Commit 9df3483

Browse files
authored
Merge pull request #27 from MZC-CSC/cicd/test
repo clean up
2 parents 153a1e1 + 11034c0 commit 9df3483

File tree

511 files changed

+2046
-184830
lines changed

Some content is hidden

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

511 files changed

+2046
-184830
lines changed

.dockerignore

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

.env.sample

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

.gitignore

Lines changed: 72 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,81 @@
1-
# mc_web_console_api
2-
mc_web_console_api/vendor/
3-
mc_web_console_api/**/*.log
4-
mc_web_console_api/**/*.sqlite
5-
mc_web_console_api/.idea/
6-
mc_web_console_api/bin/
7-
mc_web_console_api/tmp/
8-
mc_web_console_api/tmp/*
9-
mc_web_console_api/node_modules/
10-
mc_web_console_api/.sass-cache/
11-
mc_web_console_api/public/assets/
12-
mc_web_console_api/.vscode/
13-
mc_web_console_api/.grifter/
14-
mc_web_console_api/.env
15-
mc_web_console_api/**/.DS_Store
16-
mc_web_console_api/*.pid
17-
mc_web_console_api/coverage
18-
mc_web_console_api/coverage.data
19-
mc_web_console_api/.svn
20-
mc_web_console_api/.console_history
21-
mc_web_console_api/.sass-cache/*
22-
mc_web_console_api/.jhw-cache/
23-
mc_web_console_api/jhw.*
24-
mc_web_console_api/*.sublime*
25-
mc_web_console_api/dist/
26-
mc_web_console_api/generated/
27-
mc_web_console_api/.vendor/
28-
mc_web_console_api/.pnp.*
29-
mc_web_console_api/.yarn/*
30-
mc_web_console_api/!.yarn/patches
31-
mc_web_console_api/!.yarn/plugins
32-
mc_web_console_api/!.yarn/releases
33-
mc_web_console_api/!.yarn/sdks
34-
mc_web_console_api/!.yarn/versions
35-
mc_web_console_api/database.yml
1+
# api
2+
api/vendor/
3+
api/**/*.log
4+
api/**/*.sqlite
5+
api/.idea/
6+
api/bin/
7+
api/tmp/
8+
api/tmp/*
9+
api/node_modules/
10+
api/.sass-cache/
11+
api/public/assets/
12+
api/.vscode/
13+
api/.grifter/
14+
api/.env
15+
api/**/.DS_Store
16+
api/*.pid
17+
api/coverage
18+
api/coverage.data
19+
api/.svn
20+
api/.console_history
21+
api/.sass-cache/*
22+
api/.jhw-cache/
23+
api/jhw.*
24+
api/*.sublime*
25+
api/dist/
26+
api/generated/
27+
api/.vendor/
28+
api/.pnp.*
29+
api/.yarn/*
30+
api/!.yarn/patches
31+
api/!.yarn/plugins
32+
api/!.yarn/releases
33+
api/!.yarn/sdks
34+
api/!.yarn/versions
3635

37-
# mc_web_console_front
38-
mc_web_console_front/vendor/
39-
mc_web_console_front/**/*.log
40-
mc_web_console_front/**/*.sqlite
41-
mc_web_console_front/.idea/
42-
mc_web_console_front/bin/
43-
mc_web_console_front/tmp/
44-
mc_web_console_front/node_modules/
45-
mc_web_console_front/.sass-cache/
46-
mc_web_console_front/public/assets/
47-
mc_web_console_front/.vscode/
48-
mc_web_console_front/.grifter/
49-
mc_web_console_front/.env
50-
mc_web_console_front/**/.DS_Store
51-
mc_web_console_front/*.pid
52-
mc_web_console_front/coverage
53-
mc_web_console_front/coverage.data
54-
mc_web_console_front/.svn
55-
mc_web_console_front/.console_history
56-
mc_web_console_front/.sass-cache/*
57-
mc_web_console_front/.jhw-cache/
58-
mc_web_console_front/jhw.*
59-
mc_web_console_front/*.sublime*
60-
mc_web_console_front/dist/
61-
mc_web_console_front/generated/
62-
mc_web_console_front/.vendor/
63-
mc_web_console_front/.pnp.*
64-
mc_web_console_front/.yarn/*
65-
mc_web_console_front/!.yarn/patches
66-
mc_web_console_front/!.yarn/plugins
67-
mc_web_console_front/!.yarn/releases
68-
mc_web_console_front/!.yarn/sdks
69-
mc_web_console_front/!.yarn/versions
70-
mc_web_console_front/database.yml
7136

72-
# deploy
73-
devlog/mc_web_console_api.log
74-
devlog/mc_web_console_api.pid
75-
devlog/mc_web_console_front.log
76-
devlog/mc_web_console_front.pid
77-
devlog/mc_web_console_api_build.log
78-
devlog/mc_web_console_api_front.log
37+
38+
# front
39+
40+
## env
41+
front/.env*
42+
43+
## Logs
44+
front/logs
45+
front/*.log
46+
front/npm-debug.log*
47+
front/yarn-debug.log*
48+
front/yarn-error.log*
49+
front/pnpm-debug.log*
50+
front/lerna-debug.log*
51+
52+
front/node_modules
53+
front/dist
54+
front/dist-ssr
55+
56+
## Editor directories and files
57+
front/.vscode/*
58+
front/!.vscode/extensions.json
59+
front/.idea
60+
front/.DS_Store
61+
front/*.suo
62+
front/*.ntvs*
63+
front/*.njsproj
64+
front/*.sln
65+
front/*.sw?
66+
front/.iml
67+
front/.idea
7968

8069
# bin
8170
bin/mc-web-console-api
82-
bin/mc-web-console-front
8371
bin/.env
8472

85-
mc_web_console_api/database.yml
86-
.env
87-
mc_web_console_api/conf/api.yaml
73+
scripts/.env
74+
api/conf/api.yaml
8875
bin/mc-web-console-api.log
8976
bin/conf/api.yaml
90-
mc_web_console_api/conf/serverinfo
77+
api/conf/serverinfo
78+
api/conf/cmiguser.dat
79+
api/conf/cmigauthsetting.yaml
80+
api/conf/selfiamuser.dat
81+
api/conf/selfiamauthsetting.yaml

Dockerfile

Lines changed: 0 additions & 61 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

api/.env.sample

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
API_ADDR=0.0.0.0
2+
API_PORT=3000
3+
4+
DATABASE_USER=DATABASE_USER # Please CHANGE ME (REQUIRE)
5+
DATABASE_PASS=DATABASE_PASS # Please CHANGE ME (REQUIRE)
6+
DATABASE_HOST=DATABASE_HOST # Please CHANGE ME (REQUIRE)
7+
DATABASE=DATABASE # Please CHANGE ME (REQUIRE)
8+
DEV_DATABASE_URL=postgres://${DATABASE_USER}:${DATABASE_PASS}@${DATABASE_HOST}:5432/${DATABASE}
9+
10+
PROD_DATABASE_USER=DATABASE_USER # Please CHANGE ME (REQUIRE)
11+
PROD_DATABASE_PASS=DATABASE_PASS # Please CHANGE ME (REQUIRE)
12+
PROD_DATABASE_HOST=DATABASE_HOST # Please CHANGE ME (REQUIRE)
13+
PROD_DATABASE=DATABASE # Please CHANGE ME (REQUIRE)
14+
PROD_DATABASE_URL=postgres://${DATABASE_USER}:${DATABASE_PASS}@${DATABASE_HOST}:5432/${DATABASE}
15+
16+
MCIAM_USE=true

api/Dockerfile.local

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
## Stage 1 - Go Build Env
2+
FROM golang:1.22.3-alpine AS build
3+
4+
RUN apk add --no-cache gcc libc-dev musl-dev curl npm wget
5+
6+
RUN mkdir -p /util
7+
WORKDIR /util
8+
RUN wget https://github.com/gobuffalo/cli/releases/download/v0.18.14/buffalo_0.18.14_Linux_x86_64.tar.gz \
9+
&& tar -xvzf buffalo_0.18.14_Linux_x86_64.tar.gz \
10+
&& mv buffalo /usr/local/bin/buffalo \
11+
&& rm buffalo_0.18.14_Linux_x86_64.tar.gz
12+
13+
ENV GOPROXY http://proxy.golang.org
14+
ENV CGO_ENABLED=1
15+
16+
RUN mkdir -p /src/mc-web-console-api
17+
WORKDIR /src/mc-web-console-api
18+
ADD . .
19+
20+
RUN go mod download
21+
RUN buffalo build --static -o /bin/api
22+
23+
## Stage 2 - Application Deploy
24+
FROM debian:buster-slim as deploy
25+
26+
WORKDIR /app/
27+
COPY --from=build /bin/api .
28+
COPY --from=build /src/mc-web-console-api/conf /app/conf
29+
30+
ENV API_ADDR 0.0.0.0
31+
ENV API_PORT 3000
32+
33+
ENV MCIAM_USE=true
34+
35+
EXPOSE 3000
36+
CMD bash -c 'until /app/api migrate; do echo "Migration failed. Retrying in 10 seconds..."; sleep 10; done; /app/api > /app/api.log 2>&1 & tail -f /app/api.log & wait'
File renamed without changes.

0 commit comments

Comments
 (0)