Skip to content

Commit 252db66

Browse files
authored
Merge pull request #6163 from rubyforgood/fix-docker
trying to fix docker build
2 parents d7fab24 + b14ad7e commit 252db66

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ updates:
2121
# Keep this locked to 1.77.6 until
2222
# bootstrap 5.3.4 is out to silence
2323
# sass deprecation warnings
24+
# https://getbootstrap.com/docs/versions/
2425
- dependency-name: "sass"
2526
versions: ["1.77.*", "1.78.*"]
2627

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apk update && apk upgrade && apk add --update --no-cache \
2626
tzdata \
2727
vim && rm -rf /var/cache/apk/*
2828
# The ruby alpine image's apk doesn't have the current version of node
29-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ nodejs=22.11.0-r0 npm
29+
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ nodejs npm
3030

3131
WORKDIR $RAILS_ROOT
3232

docker-compose.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3"
2-
31
services:
42
web:
53
build: .
@@ -15,7 +13,11 @@ services:
1513
- config/docker.env
1614
depends_on:
1715
- database
18-
stdin_open: true
16+
healthcheck:
17+
test: ["CMD", "curl", "-f", "http://localhost:3000"]
18+
interval: 30s
19+
timeout: 10s
20+
retries: 5
1921
tty: true
2022
platform: linux/x86_64
2123

0 commit comments

Comments
 (0)