diff --git a/compose.yml b/compose.yml index cb1c10f..e8e10b9 100644 --- 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" diff --git a/makefile b/makefile index d112880..d2628e8 100644 --- a/makefile +++ b/makefile @@ -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 diff --git a/sample-back/Dockerfile b/sample-back/Dockerfile deleted file mode 100644 index e3b8dcf..0000000 --- a/sample-back/Dockerfile +++ /dev/null @@ -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 \ No newline at end of file diff --git a/sample-back/target/familySite1Backend1-0.1.0.jar b/sample-back/target/familySite1Backend1-0.1.0.jar deleted file mode 100755 index e91a276..0000000 Binary files a/sample-back/target/familySite1Backend1-0.1.0.jar and /dev/null differ diff --git a/sample-front/dist/familySite1/index.html b/sample-front/dist/familySite1/index.html index f6e9301..c566a4d 100644 --- a/sample-front/dist/familySite1/index.html +++ b/sample-front/dist/familySite1/index.html @@ -8,7 +8,7 @@