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

trying to fix docker build #6163

Merged
merged 4 commits into from
Jan 13, 2025
Merged

trying to fix docker build #6163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fadea54
aider dockerfile
compwron Jan 13, 2025
9187526
fix: Resolve package conflict by updating nodejs and npm versions in …
compwron Jan 13, 2025
95a1d17
add dependabot comment
compwron Jan 13, 2025
b14ad7e
fix: docker-compose.yml: the attribute is obsolete, it will be ignor…
compwron Jan 13, 2025
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
1 change: 1 addition & 0 deletions .github/dependabot.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading