diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 17846134..38442200 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -4,7 +4,7 @@ services: backend: build: context: . - dockerfile: backend/Dockerfile.prod + dockerfile: docker/Dockerfile.prod image: doccano_backend:prod volumes: - static_volume:/backend/staticfiles @@ -27,7 +27,7 @@ services: celery: build: context: . - dockerfile: backend/Dockerfile.prod + dockerfile: docker/Dockerfile.prod image: doccano_celery:prod volumes: - media:/backend/media diff --git a/backend/Dockerfile.prod b/docker/Dockerfile.prod similarity index 100% rename from backend/Dockerfile.prod rename to docker/Dockerfile.prod diff --git a/nginx/Dockerfile b/nginx/Dockerfile index f024767b..4a138908 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,13 +1,14 @@ -ARG NODE_VERSION="16.5-alpine3.14" +ARG NODE_VERSION="16.14-buster-slim" FROM node:${NODE_VERSION} AS frontend-builder COPY frontend/ /app/ WORKDIR /app -RUN apk add -U --no-cache git python3 make g++ \ - && yarn install \ - && yarn build \ - && apk del --no-cache git make g++ +RUN apt-get update \ + && apt-get install -y git python3 make g++ \ + && yarn install \ + && yarn build \ + && apt-get clean FROM nginx:1.21.1-alpine AS runtime