Browse Source

Replace npm with yarn

pull/897/head
Hironsan 4 years ago
parent
commit
09150bc9b8
3 changed files with 8 additions and 8 deletions
  1. 2
      docker-compose.dev.yml
  2. 8
      frontend/Dockerfile
  3. 6
      frontend/dev-nuxt.sh

2
docker-compose.dev.yml

@ -23,7 +23,7 @@ services:
- network-frontend - network-frontend
frontend: frontend:
image: node:13.2.0
image: node:13.7.0
command: ["/src/frontend/dev-nuxt.sh"] command: ["/src/frontend/dev-nuxt.sh"]
volumes: volumes:
- .:/src - .:/src

8
frontend/Dockerfile

@ -1,11 +1,11 @@
FROM node:13.2-alpine
FROM node:13.7-alpine
WORKDIR /app WORKDIR /app
COPY . /app/ COPY . /app/
RUN apk add -U --no-cache git python3 make g++ \ RUN apk add -U --no-cache git python3 make g++ \
&& npm install -g npm@latest \
&& npm install \
&& npm run build \
# && npm install -g yarn@latest \
&& yarn install \
&& yarn build \
&& apk del --no-cache git make g++ && apk del --no-cache git make g++

6
frontend/dev-nuxt.sh

@ -10,10 +10,10 @@ app="${root}/frontend"
if [[ ! -d node_modules/.bin ]]; then if [[ ! -d node_modules/.bin ]]; then
echo "Installing dependencies" echo "Installing dependencies"
npm install
yarn install
fi fi
echo "Starting frontend server" echo "Starting frontend server"
npm run lintfix
npm run dev
yarn lintfix
yarn dev
) )
Loading…
Cancel
Save