Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit a10e74a

Browse files
committed
FF-42 created dev and prod profiles, aswell as property files.
1 parent 8f74ead commit a10e74a

File tree

6 files changed

+54
-8
lines changed

6 files changed

+54
-8
lines changed

.github/workflows/deploydocker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
java-version: '11.0.8'
2525
architecture: x64
2626
- name: build image with docker
27-
run: mvn spring-boot:build-image -f pom.xml
27+
run: mvn spring-boot:build-image -f pom.xml -P prod
2828

2929
- name: Log into DockerHub Registry
3030
# Secret with `read:packages` and `write:packages` scopes saved as `CR_PAT`
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Build Image [PROD]" type="MavenRunConfiguration" factoryName="Maven">
3+
<MavenSettings>
4+
<option name="myGeneralSettings" />
5+
<option name="myRunnerSettings" />
6+
<option name="myRunnerParameters">
7+
<MavenRunnerParameters>
8+
<option name="profiles">
9+
<set />
10+
</option>
11+
<option name="goals">
12+
<list>
13+
<option value="spring-boot:build-image" />
14+
</list>
15+
</option>
16+
<option name="pomFileName" value="pom.xml" />
17+
<option name="profilesMap">
18+
<map>
19+
<entry key="prod" value="true" />
20+
</map>
21+
</option>
22+
<option name="resolveToWorkspace" value="false" />
23+
<option name="workingDirPath" value="$PROJECT_DIR$" />
24+
</MavenRunnerParameters>
25+
</option>
26+
</MavenSettings>
27+
<method v="2" />
28+
</configuration>
29+
</component>

.run/RestApplication.run.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="RestApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
2+
<configuration default="false" name="RestApplication[DEV]" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
33
<module name="RestApi" />
44
<option name="SPRING_BOOT_MAIN_CLASS" value="de.filefighter.rest.RestApplication" />
5+
<option name="ACTIVE_PROFILES" value="dev" />
56
<option name="ALTERNATIVE_JRE_PATH" />
6-
<envs>
7-
<env name="DB_NAME" value="filefighter,DB_USERNAME=root,DB_PASSWORD=1234" />
8-
</envs>
97
<method v="2">
108
<option name="Make" enabled="true" />
119
</method>

.run/RestApplication[PROD].run.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="RestApplication[PROD]" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
3+
<module name="RestApi" />
4+
<option name="SPRING_BOOT_MAIN_CLASS" value="de.filefighter.rest.RestApplication" />
5+
<option name="ACTIVE_PROFILES" value="prod" />
6+
<option name="ALTERNATIVE_JRE_PATH" />
7+
<envs>
8+
<env name="DB_NAME" value="filefighter,DB_USERNAME=root,DB_PASSWORD=1234,DB_CONTAINER_NAME=FileFighterDB" />
9+
</envs>
10+
<method v="2">
11+
<option name="Make" enabled="true" />
12+
</method>
13+
</configuration>
14+
</component>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#-------------------Overwriting prod mongo config---------------
2+
spring.data.mongodb.database=${DB_NAME}
3+
spring.data.mongodb.host=${DB_CONTAINER_NAME}
4+
spring.data.mongodb.username=${DB_USERNAME}
5+
spring.data.mongodb.password=${DB_PASSWORD}

src/main/resources/application.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ server.error.whitelabel.enabled=false
44

55
#-------------------MONGO---------------
66
spring.data.mongodb.authentication-database=admin
7-
spring.data.mongodb.database=${DB_NAME}
7+
spring.data.mongodb.database=filefighter
88
spring.data.mongodb.host=localhost
99
spring.data.mongodb.port=27017
10-
spring.data.mongodb.username=${DB_USERNAME}
11-
spring.data.mongodb.password=${DB_PASSWORD}
10+
spring.data.mongodb.username=
11+
spring.data.mongodb.password=

0 commit comments

Comments
 (0)