Fixar porta no Dockerfile

andrepenteado · Sep 22, 2023 · 37c5f96 · 37c5f96
1 parent 9950a6e
commit 37c5f96
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 11 deletions.
diff --git a/.docker/Dockerfile.backend b/.docker/Dockerfile.backend
@@ -12,5 +12,5 @@ RUN mvn --projects backend -U clean package --file /apsso/pom.xml -DskipTests
 FROM amazoncorretto:21
 WORKDIR /backend
 COPY --from=build /apsso/backend/target/backend.jar /backend/backend.jar
-ENTRYPOINT [ "java", "-jar", "/backend/backend.jar" ]
+ENTRYPOINT [ "java", "-jar", "-Dserver.port=30001", "/backend/backend.jar" ]
 EXPOSE 30001
diff --git a/.docker/Dockerfile.backend.pipeline b/.docker/Dockerfile.backend.pipeline
@@ -1,5 +1,5 @@
 FROM amazoncorretto:21
 WORKDIR /backend
 COPY backend/target/backend.jar /backend/backend.jar
-ENTRYPOINT [ "java", "-jar", "/backend/backend.jar" ]
+ENTRYPOINT [ "java", "-jar", "-Dserver.port=30001", "/backend/backend.jar" ]
 EXPOSE 30001
diff --git a/Makefile b/Makefile
@@ -2,17 +2,36 @@ VERSAO_APP := $(shell mvn help:evaluate -Dexpression=project.version -q -DforceS
 
 build-login:
 	docker build -f .docker/Dockerfile -t ghcr.io/andrepenteado/apsso/apsso -t ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP) .
-	#echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
-	#docker push ghcr.io/andrepenteado/apsso/apsso
-	#docker push ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP)
-	#docker logout ghcr.io
+	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	docker push ghcr.io/andrepenteado/apsso/apsso
+	docker push ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP)
+	docker logout ghcr.io
+
+build-login-pipeline:
+	mvn -U clean package --projects login
+	docker build -f .docker/Dockerfile.pipeline -t ghcr.io/andrepenteado/apsso/apsso -t ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP) .
+	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	docker push ghcr.io/andrepenteado/apsso/apsso
+	docker push ghcr.io/andrepenteado/apsso/apsso:$(VERSAO_APP)
+	docker logout ghcr.io
 
 build-backend:
 	docker build -f .docker/Dockerfile.backend -t ghcr.io/andrepenteado/apsso/apsso-backend -t ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP) .
-	#echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
-	#docker push ghcr.io/andrepenteado/apsso/apsso-backend
-	#docker push ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP)
-	#docker logout ghcr.io
+	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	docker push ghcr.io/andrepenteado/apsso/apsso-backend
+	docker push ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP)
+	docker logout ghcr.io
+
+build-backend-pipeline:
+	cd frontend
+	ng build --aot --build-optimizer --optimization --delete-output-path
+	cd ..
+	mvn -U clean package --projects backend -DskipTests
+	docker build -f .docker/Dockerfile.backend.pipeline -t ghcr.io/andrepenteado/apsso/apsso-backend -t ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP) .
+	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	docker push ghcr.io/andrepenteado/apsso/apsso-backend
+	docker push ghcr.io/andrepenteado/apsso/apsso-backend:$(VERSAO_APP)
+	docker logout ghcr.io
 
 start:
 	docker compose -f .docker/docker-compose.yml up -d
@@ -21,4 +40,17 @@ stop:
 	docker compose -f .docker/docker-compose.yml down
 
 log:
-	docker compose -f .docker/docker-compose.yml logs -f
+	docker compose -f .docker/docker-compose.yml logs -f
+
+update:
+	$(MAKE) stop
+	echo $(GITHUB_TOKEN) | docker login ghcr.io --username andrepenteado --password-stdin
+	docker image pull postgres:15.2
+	docker image pull ghcr.io/andrepenteado/apsso/apsso
+	docker image pull ghcr.io/andrepenteado/apsso/apsso-backend
+	docker logout ghcr.io
+	$(MAKE) start
+
+start-backend-dev:
+	docker compose -f .docker/postgresql.yml up -d
+	mvn -f backend/pom.xml clean spring-boot:run -Dspring-boot.run.profiles=dev