Skip to content

Commit 4fb3867

Browse files
authored
Merge pull request #1 from dev-ashishk/circleci-project-setup
Circleci project setup
2 parents 0d63a9c + c296b43 commit 4fb3867

File tree

8 files changed

+26
-8
lines changed

8 files changed

+26
-8
lines changed

.circleci/config.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: 2.1
2+
orbs:
3+
node: circleci/node@1.1.6
4+
jobs:
5+
build-and-test:
6+
executor:
7+
name: node/default
8+
steps:
9+
- checkout
10+
- node/with-cache:
11+
steps:
12+
- run: npm install
13+
- run: npm lint
14+
workflows:
15+
build-and-test:
16+
jobs:
17+
- build-and-test

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
/.git
55
.gitignore
66
/env
7-
.env
7+
.env

build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
echo "------ Building Docker Image -------";
4+
5+
docker-compose build --no-cache

env/dev.env renamed to dev.env

File renamed without changes.

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ services:
1313
context: .
1414
dockerfile: Dockerfile
1515
args:
16-
- PORT:$PORT
16+
- PORT:$PORT

env/prod.env

Lines changed: 0 additions & 4 deletions
This file was deleted.

webpack/dev/webpack.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = {
1919
new LoadablePlugin(),
2020
new CleanWebpackPlugin(),
2121
new Dotenv({
22-
path: "./env/dev.env", // load this now instead of the ones in '.env'
22+
path: "./dev.env", // load this now instead of the ones in '.env'
2323
safe: true, // load '.env.example' to verify the '.env' variables are all set. Can also be a string to a different file.
2424
systemvars: true, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
2525
silent: true, // hide any errors

webpack/production/webpack.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
new LoadablePlugin(),
2121
new CleanWebpackPlugin(),
2222
new Dotenv({
23-
path: "./env/prod.env", // load this now instead of the ones in '.env'
23+
path: "./.env", // load this now instead of the ones in '.env'
2424
safe: true, // load '.env.example' to verify the '.env' variables are all set. Can also be a string to a different file.
2525
systemvars: true, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
2626
silent: true, // hide any errors

0 commit comments

Comments
 (0)