Skip to content

Commit 161c6bb

Browse files
authored
Rename master branch to main #167 (#250)
1 parent a538be2 commit 161c6bb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/maven-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Java CI with Maven
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
jobs:
1313
build:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If everything goes well, you can access the following services at given location
1616
* Config Server - http://localhost:8888
1717
* AngularJS frontend (API Gateway) - http://localhost:8080
1818
* Customers, Vets and Visits Services - random port, check Eureka Dashboard
19-
* Tracing Server (Zipkin) - http://localhost:9411/zipkin/ (we use [openzipkin](https://github.com/openzipkin/zipkin/tree/master/zipkin-server))
19+
* Tracing Server (Zipkin) - http://localhost:9411/zipkin/ (we use [openzipkin](https://github.com/openzipkin/zipkin/tree/main/zipkin-server))
2020
* Admin Server (Spring Boot Admin) - http://localhost:9090
2121
* Grafana Dashboards - http://localhost:3000
2222
* Prometheus - http://localhost:9091
@@ -33,13 +33,13 @@ Alternatively you can also build all the images on Podman, which requires Podman
3333
Once images are ready, you can start them with a single command
3434
`docker-compose up` or `podman-compose up`.
3535

36-
Containers startup order is coordinated with the `service_healthy` condition of the Docker Compose [depends-on](https://github.com/compose-spec/compose-spec/blob/master/spec.md#depends_on) expression
37-
and the [healthcheck](https://github.com/compose-spec/compose-spec/blob/master/spec.md#healthcheck) of the service containers.
36+
Containers startup order is coordinated with the `service_healthy` condition of the Docker Compose [depends-on](https://github.com/compose-spec/compose-spec/blob/main/spec.md#depends_on) expression
37+
and the [healthcheck](https://github.com/compose-spec/compose-spec/blob/main/spec.md#healthcheck) of the service containers.
3838
After starting services, it takes a while for API Gateway to be in sync with service registry,
3939
so don't be scared of initial Spring Cloud Gateway timeouts. You can track services availability using Eureka dashboard
4040
available by default at http://localhost:8761.
4141

42-
The `master` branch uses an Eclipse Temurin with Java 17 as Docker base image.
42+
The `main` branch uses an Eclipse Temurin with Java 17 as Docker base image.
4343

4444
*NOTE: Under MacOSX or Windows, make sure that the Docker VM has enough memory to run the microservices. The default settings
4545
are usually not enough and make the `docker-compose up` painfully slow.*

0 commit comments

Comments
 (0)