Skip to content

Commit 44b2dcc

Browse files
committed
tests working
1 parent c754dfa commit 44b2dcc

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

.env.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ DATABASE_HOST=db
2727
DATABASE_USERNAME=postgres
2828
RAILS_RELATIVE_URL_ROOT=/api
2929

30+
RAILS_HOST=api # This is the service name in the docker-compose.yml file, not the URL

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,4 @@ dist
130130
.pnp.*
131131
.vscode/
132132
.DS_Store
133+
test/cypress/screenshots/*

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# nginx-docker-compose
1+
# Docker compose managaged test harness
22

33
Example for a blog post about nginx docker compose
44

5-
## Basic example
6-
7-
In the basic example, you will host static files with Nginx. The docker compose config is
8-
defined in the `basic.yaml` file.
5+
## Setup
96

107
To run this you will execute:
118

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ services:
1515
networks:
1616
- app-network
1717
environment:
18+
- RAILS_HOST=${RAILS_HOST}
1819
- RAILS_RELATIVE_URL_ROOT=${RAILS_RELATIVE_URL_ROOT}
1920
- DATABASE_HOST=${DATABASE_HOST}
2021
- DATABASE_USERNAME=${DATABASE_USERNAME}
2122
- RAILS_ENV=${RAILS_ENV}
22-
- BIND=tcp://0.0.0.0:3000
2323
healthcheck:
2424
test: ["CMD", "curl", "-f", "http://localhost:3000/api/ping"]
2525
interval: 10s

repo_refs/rails-app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit f488bd28da264631b4c7d38818f0c1d5bad7f20e
1+
Subproject commit 91d6d6bbf14b88d1da9b1cbb6934f7c08c08ae89

0 commit comments

Comments
 (0)