From 82dd6bf1232a7a3129ac7230b7898962d1eb1b1b Mon Sep 17 00:00:00 2001 From: alitpc25 Date: Wed, 10 May 2023 16:40:07 +0300 Subject: [PATCH 1/2] dockerfiles and docker-compose added --- practice-app/backend/.gitignore | 3 +- .../backend/disasterresponse/Dockerfile | 6 ++++ .../src/main/resources/application.properties | 10 +++++++ practice-app/docker-compose.yml | 28 +++++++++++++++++++ .../frontend/disasterresponse/Dockerfile | 6 ++++ 5 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 practice-app/backend/disasterresponse/Dockerfile create mode 100644 practice-app/docker-compose.yml create mode 100644 practice-app/frontend/disasterresponse/Dockerfile diff --git a/practice-app/backend/.gitignore b/practice-app/backend/.gitignore index 3e34343f..e10e727b 100644 --- a/practice-app/backend/.gitignore +++ b/practice-app/backend/.gitignore @@ -1,2 +1 @@ -target/ -.metadata \ No newline at end of file +/.metadata/ diff --git a/practice-app/backend/disasterresponse/Dockerfile b/practice-app/backend/disasterresponse/Dockerfile new file mode 100644 index 00000000..a72e962a --- /dev/null +++ b/practice-app/backend/disasterresponse/Dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:17-jdk +VOLUME /tmp +EXPOSE 4000 +ARG JAR_FILE=target/disasterresponse-0.0.1-SNAPSHOT.jar +ADD ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/practice-app/backend/disasterresponse/src/main/resources/application.properties b/practice-app/backend/disasterresponse/src/main/resources/application.properties index 8b137891..3649ff29 100644 --- a/practice-app/backend/disasterresponse/src/main/resources/application.properties +++ b/practice-app/backend/disasterresponse/src/main/resources/application.properties @@ -1 +1,11 @@ +# Details for our datasource +spring.datasource.url = jdbc:postgresql://localhost:5432/disasterresponse +spring.datasource.driverClassName = org.postgresql.Driver +spring.datasource.username =postgres +spring.datasource.password =112212 +spring.jpa.hibernate.ddl-auto= create +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +# To change server port only +server.port=4000 \ No newline at end of file diff --git a/practice-app/docker-compose.yml b/practice-app/docker-compose.yml new file mode 100644 index 00000000..35b1813a --- /dev/null +++ b/practice-app/docker-compose.yml @@ -0,0 +1,28 @@ +version: '3.1' +services: + app: + container_name: backend + image: backend:latest + build: ./backend/disasterresponse + ports: + - "4000:4000" + depends_on: + - postgresqldb + environment: + - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/compose-postgres + - SPRING_DATASOURCE_USERNAME=compose-postgres + - SPRING_DATASOURCE_PASSWORD=compose-postgres + - SPRING_JPA_HIBERNATE_DDL_AUTO=update + + postgresqldb: + image: 'postgres:13.1-alpine' + container_name: db + environment: + - POSTGRES_USER=compose-postgres + - POSTGRES_PASSWORD=compose-postgres + frontend: + container_name: frontend + build: ./frontend/disasterresponse + image: frontend:latest + ports: + - "3000:3000" \ No newline at end of file diff --git a/practice-app/frontend/disasterresponse/Dockerfile b/practice-app/frontend/disasterresponse/Dockerfile new file mode 100644 index 00000000..5af7e7da --- /dev/null +++ b/practice-app/frontend/disasterresponse/Dockerfile @@ -0,0 +1,6 @@ +FROM node:14-alpine +WORKDIR /app +COPY package*.json ./ +RUN npm install +COPY . . +CMD ["npm", "start"] From 8eb2e6ae8bff88fa1b23218a1fc8aee1717a3ff8 Mon Sep 17 00:00:00 2001 From: alperenDagi <111731140+alperenDagi@users.noreply.github.com> Date: Wed, 10 May 2023 16:40:19 +0300 Subject: [PATCH 2/2] add application properties --- .../src/main/resources/application.properties | 13 +++++++++++++ .../frontend/disasterresponse/package-lock.json | 16 ++++++++-------- .../frontend/disasterresponse/package.json | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/practice-app/backend/disasterresponse/src/main/resources/application.properties b/practice-app/backend/disasterresponse/src/main/resources/application.properties index 8b137891..9d81895c 100644 --- a/practice-app/backend/disasterresponse/src/main/resources/application.properties +++ b/practice-app/backend/disasterresponse/src/main/resources/application.properties @@ -1 +1,14 @@ +# Details for our datasource +spring.datasource.url = jdbc:postgresql://localhost:5432/disasterresponse +spring.datasource.driverClassName = org.postgresql.Driver +spring.datasource.username =postgres +spring.datasource.password =112212 +spring.jpa.hibernate.ddl-auto= create +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +# To change server port only +server.port=4000 + +# Google Geocoding API Key +google.api.key=AIzaSyBPeYGBe5LSvsTllC2YhCIH5RcvnohY0zE diff --git a/practice-app/frontend/disasterresponse/package-lock.json b/practice-app/frontend/disasterresponse/package-lock.json index d04fdc0c..3fcb04ea 100644 --- a/practice-app/frontend/disasterresponse/package-lock.json +++ b/practice-app/frontend/disasterresponse/package-lock.json @@ -13,7 +13,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-scripts": "5.0.1", + "react-scripts": "^5.0.1", "web-vitals": "^2.1.4" } }, @@ -16151,16 +16151,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=4.2.0" } }, "node_modules/unbox-primitive": { @@ -28726,9 +28726,9 @@ } }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true }, "unbox-primitive": { diff --git a/practice-app/frontend/disasterresponse/package.json b/practice-app/frontend/disasterresponse/package.json index 976d68d6..1d9e2d67 100644 --- a/practice-app/frontend/disasterresponse/package.json +++ b/practice-app/frontend/disasterresponse/package.json @@ -8,7 +8,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-scripts": "5.0.1", + "react-scripts": "^5.0.1", "web-vitals": "^2.1.4" }, "scripts": {