Skip to content

Commit b4fdd88

Browse files
committed
in docker, just use npm to avoid complexity
1 parent b14ad7e commit b4fdd88

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,6 @@ npm-debug.log
6262
# In case we want to keep something in the compiled assets directory
6363
!/app/assets/builds/.keep
6464
.aider*
65+
66+
# ignore package-lock.json for now, but someday we will switch from yarn to npm
67+
package-lock.json

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@ RUN apk update && apk upgrade && apk add --update --no-cache \
2525
postgresql-client \
2626
tzdata \
2727
vim && rm -rf /var/cache/apk/*
28-
# 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 npm
3028

3129
WORKDIR $RAILS_ROOT
3230

3331
COPY . .
34-
RUN npm install --global yarn
35-
RUN yarn install
36-
RUN yarn build && yarn build:css
32+
RUN npm install
33+
RUN npm build && npm build:css
3734

3835
COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
3936

0 commit comments

Comments
 (0)