diff --git a/Dockerfile b/.docker/Dockerfile similarity index 100% rename from Dockerfile rename to .docker/Dockerfile diff --git a/Dockerfile.dev b/.docker/Dockerfile.dev similarity index 88% rename from Dockerfile.dev rename to .docker/Dockerfile.dev index 680ed26..951afd4 100644 --- a/Dockerfile.dev +++ b/.docker/Dockerfile.dev @@ -1,16 +1,26 @@ FROM node:lts-alpine as build-front + RUN apk add --no-cache curl + WORKDIR /app + COPY ./client . + RUN npm install --production \ && npm run build FROM node:lts-alpine + WORKDIR /app + RUN mkdir -p ./public + COPY --from=build-front /app/build/ ./public COPY package*.json ./ + RUN npm install + COPY . . -CMD ["npm", "run", "skaffold"] + +CMD ["npm", "run", "skaffold"] \ No newline at end of file diff --git a/Dockerfile.multiarch b/.docker/Dockerfile.multiarch similarity index 63% rename from Dockerfile.multiarch rename to .docker/Dockerfile.multiarch index d0bf6ab..1bdccbb 100644 --- a/Dockerfile.multiarch +++ b/.docker/Dockerfile.multiarch @@ -1,10 +1,11 @@ -FROM node:14 as builder +FROM node:14-alpine3.11 as builder WORKDIR /app COPY package*.json ./ -RUN npm install --production +RUN apk --no-cache --virtual build-dependencies add python make g++ \ + && npm install --production COPY . . @@ -16,7 +17,7 @@ RUN mkdir -p ./public ./data \ && mv ./client/build/* ./public \ && rm -rf ./client -FROM node:14-alpine +FROM node:14-alpine3.11 COPY --from=builder /app /app @@ -26,4 +27,4 @@ EXPOSE 5005 ENV NODE_ENV=production -CMD ["node", "server.js"] +CMD ["node", "server.js"] \ No newline at end of file diff --git a/docker-compose.yml b/.docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to .docker/docker-compose.yml