ward/tds-truyen-network-site
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: site corrections & compose corrections

Browse Source
This commit is contained in:
Ward Truyen 2024-09-26 23:29:24 +02:00
parent 8a6f558608
commit bd09a2e96c
9 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose.yml
View File

@ -26,6 +26,7 @@ services:
tdsback: tdsback:
build: tds-back build: tds-back
image: tds/back
container_name: tds-api container_name: tds-api
restart: always restart: always
depends_on: depends_on:
@ -63,14 +64,15 @@ services:
- "traefik.enable=true" - "traefik.enable=true"
samplefamback: samplefamback:
image: tds/back
build: build:
context: sample-back
args: args:
jarargs: -Dspring.profiles.active=sample jarargs: -Dspring.profiles.active=sample
container_name: samplefam-api container_name: samplefam-api
restart: always restart: always
depends_on: depends_on:
- samplefamdb - samplefamdb
- tdsback
labels: labels:
- "traefik.http.routers.samplefamback.rule=Host(`sf.truyen.network`) && PathPrefix(`/api`)" - "traefik.http.routers.samplefamback.rule=Host(`sf.truyen.network`) && PathPrefix(`/api`)"
- "traefik.http.routers.samplefamback.entrypoints=websecure" - "traefik.http.routers.samplefamback.entrypoints=websecure"

5
makefile
View File

@ -11,7 +11,6 @@ clean:
rm -rf ./tds-front rm -rf ./tds-front
rm -rf ./tds-back rm -rf ./tds-back
rm -rf ./sample-front rm -rf ./sample-front
rm -rf ./sample-back
build-tds-docker-images: build-tds-docker-images:
cd ../familySite1Frontend && ng build cd ../familySite1Frontend && ng build
@ -30,10 +29,6 @@ build-sample-docker-images:
cp -r ../familySite1Frontend/dist/familySite1 ./sample-front/dist/ cp -r ../familySite1Frontend/dist/familySite1 ./sample-front/dist/
cp ../familySite1Frontend/Dockerfile ./sample-front/ cp ../familySite1Frontend/Dockerfile ./sample-front/
cd ../familySite1Backend && mvn package cd ../familySite1Backend && mvn package
mkdir -p ./sample-back/target
cp -r ../familySite1Backend/target/*.jar ./sample-back/target/
cp ../familySite1Backend/Dockerfile ./sample-back/
chmod a+x ./sample-back/target/*.jar
deploy: deploy:
docker compose up -d --build --remove-orphans docker compose up -d --build --remove-orphans

10
sample-back/Dockerfile
View File

@ -1,10 +0,0 @@
FROM openjdk:24-jdk-slim
ARG JAR_FILE=target/*.jar
COPY ${JAR_FILE} app.jar
ARG jarargs=''
ENV myArgs=$jarargs
EXPOSE 8080
ENTRYPOINT java -jar $myArgs /app.jar

BIN
sample-back/target/familySite1Backend1-0.1.0.jar
View File

Binary file not shown.

2
sample-front/dist/familySite1/index.html vendored
View File

@ -8,7 +8,7 @@
<body> <body>
<app-root></app-root> <app-root></app-root>
<script src="runtime.ed14f20cc9779f09.js" type="module"></script><script src="polyfills.1358c66226f5aae4.js" type="module"></script><script src="main.e93c608155d9b8c8.js" type="module"></script> <script src="runtime.ed14f20cc9779f09.js" type="module"></script><script src="polyfills.1358c66226f5aae4.js" type="module"></script><script src="main.25fcd3d08a5c494f.js" type="module"></script>
</body></html> </body></html>

2
sample-front/dist/familySite1/main.e93c608155d9b8c8.js → sample-front/dist/familySite1/main.25fcd3d08a5c494f.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
tds-back/target/familySite1Backend1-0.1.0.jar
View File

Binary file not shown.

2
tds-front/dist/familySite1/index.html vendored
View File

@ -8,7 +8,7 @@
<body> <body>
<app-root></app-root> <app-root></app-root>
<script src="runtime.ed14f20cc9779f09.js" type="module"></script><script src="polyfills.1358c66226f5aae4.js" type="module"></script><script src="main.f56200f3b8c81316.js" type="module"></script> <script src="runtime.ed14f20cc9779f09.js" type="module"></script><script src="polyfills.1358c66226f5aae4.js" type="module"></script><script src="main.e1f7111bcc0fccb6.js" type="module"></script>
</body></html> </body></html>

2
tds-front/dist/familySite1/main.f56200f3b8c81316.js → tds-front/dist/familySite1/main.e1f7111bcc0fccb6.js vendored
View File

File diff suppressed because one or more lines are too long