Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lol-statis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jozef Bugoš
lol-statis
Commits
bd5700c5
Commit
bd5700c5
authored
3 years ago
by
Jozef Bugoš
Browse files
Options
Downloads
Plain Diff
Merge branch 'rc' into 'master'
Rc See merge request
!3
parents
8dc0c4ac
3a3b4366
No related branches found
No related tags found
1 merge request
!3
Rc
Pipeline
#34112
passed
3 years ago
Stage: build
Stage: test
Stage: docker
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker-compose.yml
+38
-13
38 additions, 13 deletions
docker-compose.yml
src/main/resources/application-dev.properties
+1
-1
1 addition, 1 deletion
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
+1
-1
1 addition, 1 deletion
src/main/resources/application-prod.properties
with
40 additions
and
15 deletions
docker-compose.yml
+
38
−
13
View file @
bd5700c5
version
:
'
3'
services
:
eureka-peer-1
:
peer-1-server
:
image
:
bugosjoz/eureka
container_name
:
peer-1-server
ports
:
-
9001:9001
entrypoint
:
-
java
-
-Dspring.profiles.active=peer-1
-
-jar
-
eureka-0.0.1-SNAPSHOT.jar
eureka-peer-2
:
networks
:
-
network-eureka
peer-2-server
:
image
:
bugosjoz/eureka
container_name
:
peer-2-server
ports
:
-
9002:9002
entrypoint
:
-
java
-
-Dspring.profiles.active=peer-2
-
-jar
-
eureka-0.0.1-SNAPSHOT.jar
eureka-peer-3
:
networks
:
-
network-eureka
peer-3-server
:
image
:
bugosjoz/eureka
container_name
:
peer-3-server
ports
:
-
9003:9003
entrypoint
:
-
java
-
-Dspring.profiles.active=peer-3
-
-jar
-
eureka-0.0.1-SNAPSHOT.jar
networks
:
-
network-eureka
lol-statis
:
image
:
bugosjoz/lol-statistics
entrypoint
:
-
java
-
-Dspring.profiles.active=prod
-
-jar
-
lol-statistics-0.0.1-SNAPSHOT.jar
ports
:
-
8080:8080
networks
:
-
network-eureka
# entrypoint:
# - java
# - -Dspring.profiles.active=prod
# - -jar
# - lol-statistics-0.0.1-SNAPSHOT.jar
lol-statis-adapter
:
image
:
lasstani/lol-statis-adapter
entrypoint
:
-
java
-
-Dspring.profiles.active=prod
-
-jar
-
lol-statistics-0.0.1-SNAPSHOT.jar
ports
:
-
8082:8082
networks
:
-
network-eureka
# entrypoint:
# - java
# - -Dspring.profiles.active=prod
# - -jar
# - lol-statistics-0.0.1-SNAPSHOT.jar
#version: "3"
#services:
...
...
@@ -45,3 +68,5 @@ services:
# image: lol-statistics
# ports:
# - "8080:8080"
networks
:
network-eureka
:
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev.properties
+
1
−
1
View file @
bd5700c5
API_KEY
=
RGAPI-3a5704ba-22a3-4c04-942f-dd1ca1b43ba2
management.endpoints.jmx.exposure.exclude
=
info, health
eureka.client.serviceUrl.defaultZone
=
http://peer-1-server
.com
:9001/eureka, http://peer-2-server
.com
:9002/eureka, http://peer-3-server
.com
:9003/eureka
eureka.client.serviceUrl.defaultZone
=
http://peer-1-server:9001/eureka, http://peer-2-server:9002/eureka, http://peer-3-server:9003/eureka
spring.application.name
=
LOL-STATISTICS-DEV
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/application-prod.properties
+
1
−
1
View file @
bd5700c5
API_KEY
=
RGAPI-3a5704ba-22a3-4c04-942f-dd1ca1b43ba2
management.endpoints.jmx.exposure.exclude
=
info, health
eureka.client.serviceUrl.defaultZone
=
http://peer-1-server
.com
:9001/eureka, http://peer-2-server
.com
:9002/eureka, http://peer-3-server
.com
:9003/eureka
eureka.client.serviceUrl.defaultZone
=
http://peer-1-server:9001/eureka, http://peer-2-server:9002/eureka, http://peer-3-server:9003/eureka
spring.application.name
=
LOL-STATISTICS
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment