Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update location of docker/terraform files and use healthcheck/ endpoint #365

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Update location of docker/terraform files and use healthcheck/ endpoint #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81beb74
Update locate of docker/terraform files
jordanpadams Jul 31, 2023
054018a
Update terraform script to use healthcheck/
jordanpadams Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 service/docker/Dockerfile → docker/Dockerfile
View file
Open in desktop
File renamed without changes.
0 service/docker/Dockerfile.aws → docker/Dockerfile.aws
View file
Open in desktop
File renamed without changes.
0 service/docker/Dockerfile.local → docker/Dockerfile.local
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions service/docker/README.md → docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ Building a local image:
$ git clone https://github.com/NASA-PDS/registry-api.git
$ cd registry-api
$ mvn package
$ docker image build --build-arg api_jar=service/target/registry-api-service-*.jar --tag registry-api-service:latest --file service/docker/Dockerfile .
$ docker image build --build-arg api_jar=service/target/registry-api-service-*.jar --tag registry-api-service:latest --file docker/Dockerfile .
```

Building an image from a released jar file:
```console
$ docker image build --build-arg api_jar=https://github.com/NASA-PDS/registry-api/releases/download/v1.0.0/registry-api-service-1.0.0.jar --tag nasapds/registry-api-service:1.0.0 --file service/docker/Dockerfile .
$ docker image build --build-arg api_jar=https://github.com/NASA-PDS/registry-api/releases/download/v1.0.0/registry-api-service-1.0.0.jar --tag nasapds/registry-api-service:1.0.0 --file docker/Dockerfile .
```

## 📍 Dockerfile.aws
Expand Down
0 service/terraform/aws/api_uri_rewrite.js → terraform/aws/api_uri_rewrite.js
View file
Open in desktop
File renamed without changes.
0 ...e/terraform/aws/test_api_uri_rewrite.html → terraform/aws/test_api_uri_rewrite.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions service/terraform/ecs.tf → terraform/ecs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ resource "aws_lb_target_group" "pds-registry-target-group" {

health_check {
enabled = true
path = "/swagger-ui/index.html"
matcher = "200,301,302"
path = "/healthcheck"
matcher = "200"
interval = 60
}
}
Expand Down
0 service/terraform/provider.tf → terraform/provider.tf
View file
Open in desktop
File renamed without changes.
0 service/terraform/secrets.tf → terraform/secrets.tf
View file
Open in desktop
File renamed without changes.
0 service/terraform/variables.tf → terraform/variables.tf
View file
Open in desktop
File renamed without changes.
Loading