From c04040489eda63b5fbeb03bacea0d538ab3fa213 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 22 Jul 2018 21:30:19 +0100 Subject: [PATCH] Setup nodejs in docker file --- .nvmrc | 1 + Dockerfile | 13 ++++++++++++- docker-compose.yml | 5 ++++- package-lock.json | 5 +++++ package.json | 12 ++++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 .nvmrc create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..2cf514e --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +10.5.0 diff --git a/Dockerfile b/Dockerfile index 477c533..da245a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,21 @@ WORKDIR /app COPY Pipfile Pipfile COPY Pipfile.lock Pipfile.lock + +COPY .nvmrc .nvmrc +COPY package.json package.json +COPY package-lock.json package-lock.json + RUN pipenv install --deploy --system -COPY . /app +RUN /opt/setup-pyenv-nvm.sh npm install + +COPY manage.py /app/manage.py +COPY project/ /app/project/ +COPY static/ /app/static/ +COPY templates/ /app/templates/ RUN ./manage.py collectstatic --noinput +ENTRYPOINT ["/opt/setup-pyenv-nvm.sh"] EXPOSE 8000 diff --git a/docker-compose.yml b/docker-compose.yml index 3f15acb..c3371a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,9 @@ services: ports: - "8000:8000" volumes: - - ".:/app" + - ./project/:/app/project/ + - ./static/:/app/static/ + - ./templates/:/app/templates/ + depends_on: - db diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..6ec588c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "website", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..8e944c6 --- /dev/null +++ b/package.json @@ -0,0 +1,12 @@ +{ + "name": "website", + "version": "1.0.0", + "description": "", + "scripts": {}, + "repository": { + "type": "git", + "url": "git+https://github.com/RealOrangeOne/website.git" + }, + "author": "", + "dependencies": {} +}