Skip to content

Commit

Permalink
Merge pull request #6163 from rubyforgood/fix-docker
Browse files Browse the repository at this point in the history
trying to fix docker build
  • Loading branch information
compwron authored Jan 13, 2025
2 parents d7fab24 + b14ad7e commit 252db66
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ updates:
# Keep this locked to 1.77.6 until
# bootstrap 5.3.4 is out to silence
# sass deprecation warnings
# https://getbootstrap.com/docs/versions/
- dependency-name: "sass"
versions: ["1.77.*", "1.78.*"]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN apk update && apk upgrade && apk add --update --no-cache \
tzdata \
vim && rm -rf /var/cache/apk/*
# The ruby alpine image's apk doesn't have the current version of node
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ nodejs=22.11.0-r0 npm
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ nodejs npm

WORKDIR $RAILS_ROOT

Expand Down
8 changes: 5 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
web:
build: .
Expand All @@ -15,7 +13,11 @@ services:
- config/docker.env
depends_on:
- database
stdin_open: true
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000"]
interval: 30s
timeout: 10s
retries: 5
tty: true
platform: linux/x86_64

Expand Down

0 comments on commit 252db66

Please sign in to comment.