diff --git a/compose.yaml b/compose.yaml deleted file mode 100644 index 4c71203..0000000 --- a/compose.yaml +++ /dev/null @@ -1 +0,0 @@ -services: { } diff --git a/docker-compose.yml b/docker-compose.yml index 8ed577a..4b4db37 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,24 +1,5 @@ -name: projekt-arendehantering - services: - app: - image: projekt-arendehantering:latest - container_name: projekt-arendehantering-app - ports: - - "8080:8080" - environment: - # Pick ONE DB profile when starting: --profile postgres OR --profile mysql - SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL:-jdbc:postgresql://postgres:5432/arende} - SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-arende} - SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-arende} - SPRING_JPA_HIBERNATE_DDL_AUTO: ${SPRING_JPA_HIBERNATE_DDL_AUTO:-update} - depends_on: - postgres: - condition: service_healthy - mysql: - condition: service_healthy - - postgres: + postgresql: image: postgres:17-alpine container_name: projekt-arendehantering-postgres profiles: ["postgres"] @@ -36,26 +17,6 @@ services: timeout: 3s retries: 20 - mysql: - image: mysql:9.4 - container_name: projekt-arendehantering-mysql - profiles: ["mysql"] - environment: - MYSQL_DATABASE: arende - MYSQL_USER: arende - MYSQL_PASSWORD: arende - MYSQL_ROOT_PASSWORD: root - ports: - - "3306:3306" - volumes: - - mysql_data:/var/lib/mysql - healthcheck: - test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p$$MYSQL_ROOT_PASSWORD --silent"] - interval: 5s - timeout: 5s - retries: 30 - volumes: postgres_data: - mysql_data: diff --git a/pom.xml b/pom.xml index bc27a29..ab78dcc 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,37 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-security + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-webmvc + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.projectlombok + lombok + annotationProcessor + + + org.springframework.security + spring-security-test + test + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity6 + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1ea3027..f7f2344 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,9 @@ spring.application.name=Projekt-arendehantering + +spring.datasource.url=jdbc:postgresql://localhost:5432/arende +spring.datasource.username=arende +spring.datasource.password=arende + +spring.jpa.hibernate.ddl-auto=update +spring.datasource.driver-class-name=org.postgresql.Driver +spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect \ No newline at end of file