Merge pull request pycontw#1151 from pycontw/ben/dockerfile-enhanced

build(dockerfile): enhanced production dockerfile

Dockerfile

@@ -1,57 +1,51 @@
-FROM python:3.6-buster
+# [Node Stage to get node_modolues and node dependencies]
+FROM node:8.16.0-buster-slim as node_stage
+
+COPY ./yarn.lock yarn.lock
+COPY ./package.json package.json
+
+RUN npm install -g yarn
+RUN yarn install --dev --frozen-lockfile \
+ && rm -rf $HOME/.cache/yarn/*
+
+
+# [Python Stage for Django web server]
+FROM python:3.6-slim-buster as python_stage
+
+COPY --from=node_stage /node_modules /usr/local/lib/node_modules
+COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node
 
 ENV PYTHONUNBUFFERED 1
 ENV BASE_DIR /usr/local
 ENV APP_DIR $BASE_DIR/app
 
-ENV NVM_INSTALLER_URL https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh
-ENV NVM_DIR $BASE_DIR/nvm
-ENV YARN_VERSION 1.15.2-1
-ENV NODE_VERSION 8.16.0
+# make nodejs accessible and executable globally
+ENV NODE_PATH /usr/local/lib/node_modules/
+ENV PATH /usr/local/bin:$PATH
 
-# make nodejs and yarn accessible and executable globally
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
-ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 # Add bin directory used by `pip install --user`
-ENV PATH "/home/docker/.local/bin:${PATH}"
+ENV PATH /home/docker/.local/bin:$PATH
 
 # Infrastructure tools
 # gettext is used for django to compile .po to .mo files.
 RUN apt-get update
-RUN apt-get install apt-utils -y
-RUN apt-get update
-RUN apt-get install gettext python3-pip -y
-
-# Install Node and Yarn from upstream
-RUN curl -o- $NVM_INSTALLER_URL | bash \
- && . $NVM_DIR/nvm.sh \
- && nvm install $NODE_VERSION \
- && nvm alias default $NODE_VERSION \
- && nvm use default \
- && nvm --version \
- && npm install -g yarn \
- && yarn --version
+RUN apt-get install gettext libpq-dev gcc -y
 
 # APP directory setup
 RUN adduser --system --disabled-login docker \
  && mkdir -p "$BASE_DIR" "$APP_DIR" "$APP_DIR/src/assets" "$APP_DIR/src/media" \
  && chown -R docker:nogroup "$BASE_DIR" "$APP_DIR"
 
 USER docker
-WORKDIR $APP_DIR
 
 # Only copy and install requirements to improve caching between builds
 # Install Python dependencies
 COPY --chown=docker:nogroup ./requirements $APP_DIR/requirements
 RUN pip3 install --user -r "$APP_DIR/requirements/production.txt" \
  && rm -rf $HOME/.cache/pip/*
-# Install Javascript dependencies
-COPY --chown=docker:nogroup ./package.json $APP_DIR/package.json
-COPY --chown=docker:nogroup ./yarn.lock $APP_DIR/yarn.lock
-RUN yarn install --dev --frozen-lockfile \
- && rm -rf $HOME/.cache/yarn/*
+
 # Finally, copy all the project files along with source files
-COPY --chown=docker:nogroup . $APP_DIR
+COPY --chown=docker:nogroup ./ $APP_DIR
 
 WORKDIR $APP_DIR/src
 VOLUME $APP_DIR/src/media

dev.Dockerfile

@@ -1,44 +1,41 @@
-FROM python:3.6-slim-buster
+# [Node Stage to get node_modolues and node dependencies]
+FROM node:8.16.0-buster-slim as node_stage
 
-ENV PYTHONUNBUFFERED 1
-WORKDIR /app
+COPY ./yarn.lock yarn.lock
+COPY ./package.json package.json
 
-ENV BASE_DIR /usr/local
+RUN apt-get update
+RUN apt-get install python-pip -y
 
-ENV NVM_INSTALLER_URL https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh
-ENV NVM_DIR $BASE_DIR/nvm
-ENV YARN_VERSION 1.15.2-1
-ENV NODE_VERSION 8.16.0
+RUN npm install -g yarn
+RUN yarn install --dev --frozen-lockfile
+
+# [Python Stage for Django web server]
+FROM python:3.6-slim-buster as python_stage
+
+WORKDIR /app
 
-# make nodejs and yarn accessible and executable globally
-ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
+COPY --from=node_stage /node_modules ./node_modules
+COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node
+
+ENV PYTHONUNBUFFERED 1
+ENV BASE_DIR /usr/local
 
 # Infrastructure tools
 # gettext is used for django to compile .po to .mo files.
 RUN apt-get update
-RUN apt-get install apt-utils -y
-RUN apt-get update
-RUN apt-get install gettext python3-pip -y
-
-# Install Node and Yarn from upstream
-RUN curl -o- $NVM_INSTALLER_URL | bash \
- && . $NVM_DIR/nvm.sh \
- && nvm install $NODE_VERSION \
- && nvm alias default $NODE_VERSION \
- && nvm use default \
- && nvm --version \
- && npm install -g yarn \
- && yarn --version
-
+RUN apt-get install -y \
+ libpq-dev \
+ gcc \
+ zlib1g-dev \
+ libjpeg62-turbo-dev \
+ gettext
+
+# Only copy and install requirements to improve caching between builds
 # Install Python dependencies
 COPY ./requirements ./requirements
 RUN pip3 install -r ./requirements/dev.txt
 
-# # Install Javascript dependencies
-COPY ./package.json ./package.json
-COPY ./yarn.lock ./yarn.lock
-RUN yarn install --dev --frozen-lockfile
-
 # for entry point
 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh