chore: site corrections & compose corrections

2024-09-26 23:29:24 +02:00 · 2024-09-26 23:29:24 +02:00 · bd09a2e96c
commit bd09a2e96c
parent 8a6f558608
9 changed files with 7 additions and 20 deletions
--- a/compose.yml
+++ b/compose.yml
@ -26,6 +26,7 @@ services:

  tdsback:                                                                                                        
    build: tds-back                                                                                                  
+    image: tds/back
    container_name: tds-api
    restart: always
    depends_on:
@ -63,14 +64,15 @@ services:
      - "traefik.enable=true"

  samplefamback:                                                                                                        
+    image: tds/back
    build: 
-      context: sample-back                                                                                                  
      args:
        jarargs: -Dspring.profiles.active=sample
    container_name: samplefam-api
    restart: always
    depends_on:
      - samplefamdb
+      - tdsback
    labels:                                                                                                   
      - "traefik.http.routers.samplefamback.rule=Host(`sf.truyen.network`) && PathPrefix(`/api`)"                                           
      - "traefik.http.routers.samplefamback.entrypoints=websecure"
--- a/5
+++ b/5
@ -11,7 +11,6 @@ clean:
 	rm -rf ./tds-front
 	rm -rf ./tds-back
 	rm -rf ./sample-front
-	rm -rf ./sample-back

 build-tds-docker-images:
 	cd ../familySite1Frontend && ng build
@ -30,10 +29,6 @@ build-sample-docker-images:
 	cp -r ../familySite1Frontend/dist/familySite1 ./sample-front/dist/
 	cp ../familySite1Frontend/Dockerfile ./sample-front/
 	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:
 	docker compose up -d --build --remove-orphans
--- a/sample-back/Dockerfile
+++ b/sample-back/Dockerfile
@ -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
--- a/sample-back/target/familySite1Backend1-0.1.0.jar
+++ b/sample-back/target/familySite1Backend1-0.1.0.jar
--- a/sample-front/dist/familySite1/index.html
+++ b/sample-front/dist/familySite1/index.html
@ -8,7 +8,7 @@

 <body>
  <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>
--- a/sample-front/dist/familySite1/main.25fcd3d08a5c494f.js
+++ b/sample-front/dist/familySite1/main.25fcd3d08a5c494f.js
--- a/tds-back/target/familySite1Backend1-0.1.0.jar
+++ b/tds-back/target/familySite1Backend1-0.1.0.jar
--- a/tds-front/dist/familySite1/index.html
+++ b/tds-front/dist/familySite1/index.html
@ -8,7 +8,7 @@

 <body>
  <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>
--- a/tds-front/dist/familySite1/main.e1f7111bcc0fccb6.js
+++ b/tds-front/dist/familySite1/main.e1f7111bcc0fccb6.js