Marvinified

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master

Marvinified

node_modules

Marvinified

{
  ...
  "scripts": {
    ...
    "prod:build": "docker-compose -f docker-compose.yml -f production.yml  build",
    "prod:up": "docker-compose -f docker-compose.yml -f production.yml up -d --build"
  }
  ...
}

Marvinified

# production.yml


version: '3.5'
services:
  web:
    build:
      context: .
      dockerfile: Dockerfile-production
    ports:

Marvinified

server {
  listen 80;
  location / {
    root /usr/share/nginx/html;
    index index.html index.htm;
    try_files $uri $uri/ /index.html =404;
  }
}

Marvinified

#==================== Building Stage=======================#

# Create the image based on the official Node 10 image from Dockerhub
FROM node:10 as node
# Create a new directory
RUN mkdir -p /app

# Change directory so that our commands run inside this new directory
WORKDIR /app

Marvinified

{
  "scripts": {
    ...
    "start": "CHOKIDAR_USEPOLLING=true react-scripts start",
    "dev:up": "docker-compose -f docker-compose.yml -f dev.yml up",
    "dev:build": "docker-compose -f docker-compose.yml -f dev.yml build"
    ...
  }
}

Marvinified

#Filename: dev.yml
version: '3.5'
services:
  web:
    command: npm start
    build:
      context: .
      dockerfile: Dockerfile
    ports:
      - 3000:3000

Marvinified

#Filename: docker-compose.yml
version: '3.5'
services:
  web:
    volumes:
      - .:/app
      - /app/node_modules

Marvinified

#Filename: Dockerfile
FROM node:10
# Create a work directory and copy over our dependency manifest files.
RUN mkdir /app
WORKDIR /app
COPY /src /app/src
COPY ["package.json", "package-lock.json*", "./"]
RUN npm install
#Expose Port 3000 since this is our dev environment
EXPOSE 3000