Skip to content

Commit

Permalink
Merge branch 'develop' into feature/generate-java-client
Browse files Browse the repository at this point in the history
  • Loading branch information
milesha authored Oct 25, 2024
2 parents 4693f32 + 5534b68 commit e86e211
Show file tree
Hide file tree
Showing 330 changed files with 19,696 additions and 7,374 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
Expand Down
4 changes: 3 additions & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- app-network

postgres:
image: 'postgres:latest'
image: 'postgres:16'
environment:
- POSTGRES_DB=hephaestus
- POSTGRES_PASSWORD=root
Expand All @@ -27,6 +27,8 @@ services:
app-network:
aliases:
- postgres
volumes:
- 'postgresql-data:/var/lib/postgresql/data'

networks:
app-network:
Expand Down
22 changes: 21 additions & 1 deletion server/application-server/HELP.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,26 @@ This will start your application in a local development environment. You can acc

Setting environment variables works through profile-based `application.yml` files. For local development, create a `application-local.yml` file overwriting the original properties. See [Using the Plugin :: Spring Boot](https://docs.spring.io/spring-boot/maven-plugin/using.html#using.overriding-command-line) for more information.


### Keycloak Development Test Users

If you started server for development it will import the example config for Keycloak from `keycloak-hephaestus-realm-example-config.json`.

#### Admin Account

- Username: `admin`
- Password: `admin`

Has the `admin` role.

#### Test User Account

- Username: `testuser`
- Password: `testuser`

Does not have the `admin` role.


### Reference Documentation

For further reference, please consider the following sections:
Expand Down Expand Up @@ -47,7 +67,7 @@ The following guides illustrate how to use some features concretely:
This project contains a Docker Compose file named `compose.yaml`.
In this file, the following services have been defined:

- postgres: [`postgres:latest`](https://hub.docker.com/_/postgres)
- postgres: [`postgres:16`](https://hub.docker.com/_/postgres)

Please review the tags of the used images and set them to the same as you're running in production.

Expand Down
28 changes: 26 additions & 2 deletions server/application-server/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
# Used for local development

services:
postgres:
image: 'postgres:latest'
image: 'postgres:16'
environment:
POSTGRES_DB: hephaestus
POSTGRES_PASSWORD: root
POSTGRES_USER: root
ports:
- '5432'
- '5432:5432'
networks:
- app-network

keycloak:
image: quay.io/keycloak/keycloak:26.0.0
environment:
KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: admin
KEYCLOAK_IMPORT: /opt/keycloak/data/import/hephaestus-realm.json
command:
- start-dev
- --import-realm
ports:
- '8081:8080'
volumes:
- ./keycloak-hephaestus-realm-example-config.json:/opt/keycloak/data/import/hephaestus-realm.json
networks:
- app-network

networks:
app-network:
driver: bridge
Loading

0 comments on commit e86e211

Please sign in to comment.