Skip to content

Commit 5f240ac

Browse files
committed
address PR review
1 parent 72f8fb4 commit 5f240ac

File tree

7 files changed

+10
-20
lines changed

7 files changed

+10
-20
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
if: ${{ always() }}
163163
uses: actions/upload-artifact@v4
164164
with:
165-
name: ruby-nara Build Report (${{ github.run_id }}_${{ github.run_attempt }})
165+
name: ${{ github.repository }} Build Report (${{ github.run_id }}_${{ github.run_attempt }})
166166
path: artifacts/*
167167
if-no-files-found: error
168168

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@ Rails web app for viewing the NARA case files database. This application runs on
44

55
The Nara database app can be found under the archived Chinese immigration website at <https://web.archive.org/web/20220124061848/https://bancroft.berkeley.edu/collections/chinese-immigration-to-the-united-states-1884-1944/index.html>. Alternatively, you can visit the website at https://nara.lib.berkeley.edu/
66

7-
## Local development
7+
## Local development and CI
88

9-
Local development and CI is handled by Docker Compose. The app requires a custom MariaDB configuration (see [`mariadb/conf.d/nara.cnf`](dmariadb/conf.d/nara.cnf)). This should get automatically loaded as you bring the container up locally, but this setting needs to be deployed to the Swarm configuration.
9+
Local development and CI is handled by Docker Compose. The app requires a custom MariaDB configuration variable (see [`docker-compose.yml`](docker-compose.yml)). This should get automatically loaded as you bring the container up locally, but this setting needs to be deployed to the Swarm configuration.
1010

11-
By default, the application does not ship with any data, but you can load some if you place a dump file in `mariadb/docker-entrypoint-initdb.d` and bring the containers up with a supplemental Compose file, e.g.
12-
13-
```bash
14-
cp nara-dump.sql.gz mariadb/docker-entrypoint-initdb.d
15-
docker compose -f docker-compose.yml -f docker-compose.dump.yml up -d
16-
```
11+
By default, Docker Compose will load sample data given a file in `db/dumps`. In CI, no sample data is loaded.
1712

1813
## Testing
1914

docker-compose.ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ services:
77
volumes: !override
88
- artifacts:/opt/app/artifacts
99

10+
db:
11+
volumes: !reset
12+
1013
volumes:
1114
artifacts:

docker-compose.dump.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ services:
55
environment:
66
# Default password for the image is empty
77
MYSQL_ROOT_PASSWORD: root
8+
MYSQL_DATABASE: NARA
89
restart: always
910
ports:
1011
- 3306:3306
12+
command: --ft-min-word-len=3
1113
volumes:
12-
- ./mariadb/conf.d:/etc/mysql/conf.d
14+
- ./db/dumps:/docker-entrypoint-initdb.d
1315

1416
app:
1517
build:

mariadb/conf.d/nara.cnf

Lines changed: 0 additions & 3 deletions
This file was deleted.

mariadb/docker-entrypoint-initdb.d/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)