Skip to content

Commit

Permalink
Merge pull request #1 from DenktMit-eG/feature/keycloak-initializer
Browse files Browse the repository at this point in the history
Feature/keycloak initializer
  • Loading branch information
MariusSchmidt authored Feb 15, 2024
2 parents 99247f5 + a5c4360 commit 3d2665e
Show file tree
Hide file tree
Showing 11 changed files with 621 additions and 49 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ jobs:
--health-retries 5
ports:
- 5432:5432
keycloak-it:
image: "jboss/keycloak:11.0.0"
env:
KEYCLOAK_USER: admin
KEYCLOAK_PASSWORD: admin
DB_VENDOR: h2
ports:
- 18080:8080

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ ehthumbs_vista.db
# Dump file
*.stackdump

# Folder initializerConfig file
# Folder config file
Desktop.ini

# Recycle Bin used on file shares
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ container provided external services.

## The initializers
### PostgresInitializer

### KeycloakInitializer


## Local development
Please note, that any paths used in this documentation are relative to this
projects root directory
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ services:
- "${DB_IT_PORT}:5432"
volumes:
- db-it-data:/var/lib/postgresql/data
keycloak-it:
image: "jboss/keycloak:11.0.0"
container_name: "${COMPOSE_PROJECT_NAME}-keycloak-it"
hostname: keycloak-it
restart: unless-stopped
environment:
- "KEYCLOAK_USER=admin"
- "KEYCLOAK_PASSWORD=admin"
- "DB_VENDOR=h2"
ports:
- "18080:8080"

volumes:
db-it-data:
56 changes: 35 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<revision>0.0.1</revision>
<revision>0.1.0</revision>
<sha1></sha1>
<!--suppress UnresolvedMavenProperty -->
<skip.tests.all>${skipTests}</skip.tests.all>
Expand All @@ -42,34 +42,36 @@
<version.org.apache.maven.plugins.maven-surefire-plugin>3.1.2</version.org.apache.maven.plugins.maven-surefire-plugin>
<version.org.assertj>3.24.2</version.org.assertj>
<version.org.assertj.assertj-core>${version.org.assertj}</version.org.assertj.assertj-core>
<version.org.codehaus.mojo.flatten-maven-plugin>1.5.0</version.org.codehaus.mojo.flatten-maven-plugin>
<version.org.flywaydb.flyway-core>9.16.3</version.org.flywaydb.flyway-core>
<version.org.codehaus.mojo.flatten-maven-plugin>1.6.0</version.org.codehaus.mojo.flatten-maven-plugin>
<version.org.flywaydb.flyway-core>9.22.3</version.org.flywaydb.flyway-core>
<version.org.jacoco.jacoco-maven-plugin>0.8.11</version.org.jacoco.jacoco-maven-plugin>
<version.org.junit>5.9.1</version.org.junit>
<version.org.junit-pioneer.junit-pioneer>2.1.0</version.org.junit-pioneer.junit-pioneer>
<version.org.junit>5.10.1</version.org.junit>
<version.org.junit-pioneer.junit-pioneer>2.2.0</version.org.junit-pioneer.junit-pioneer>
<version.org.junit.jupiter.junit-jupiter-engine>${version.org.junit}</version.org.junit.jupiter.junit-jupiter-engine>
<version.org.keycloak.keycloak-admin-client>11.0.0</version.org.keycloak.keycloak-admin-client>
<version.org.postgresql.postgresql>42.6.0</version.org.postgresql.postgresql>
<version.org.sonatype.plugins.nexus-staging-maven-plugin>1.6.13</version.org.sonatype.plugins.nexus-staging-maven-plugin>
<version.org.springframework.boot.spring-boot-test>3.1.5</version.org.springframework.boot.spring-boot-test>
<version.org.springframework.boot>3.2.2</version.org.springframework.boot>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${version.org.springframework.boot}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>${version.org.flywaydb.flyway-core}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
<version>${version.org.springframework.boot.spring-boot-test}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${version.org.postgresql.postgresql}</version>
<scope>runtime</scope>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>${version.org.keycloak.keycloak-admin-client}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand All @@ -83,20 +85,26 @@
<version>${version.org.junit-pioneer.junit-pioneer}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${version.org.junit.jupiter.junit-jupiter-engine}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
Expand All @@ -106,6 +114,12 @@
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
Loading

0 comments on commit 3d2665e

Please sign in to comment.