Docker cleanup

GetStream · Sep 7, 2018 · ec12a12 · ec12a12
2 parents 3a46db0 + 61519e9
commit ec12a12
Show file tree

Hide file tree

Showing 11 changed files with 493 additions and 329 deletions.
diff --git a/api/build.sh b/api/build.sh
diff --git a/api/scripts/make-build.sh b/api/scripts/make-build.sh
@@ -1,16 +1,25 @@
 #!/bin/bash
 
-# Create a fresh dist directory
+# Remove the existing build directory and create a fresh one
 rm -rf ../dist && mkdir ../dist
 
-# Transpile src to JavaScript
-npx babel ../src --out-dir ../dist
+# Transpile ES6 to JavaScript
+npx babel ../src --out-dir ../dist --ignore node_modules
 
-# Copy pm2 runtime file
-cp ../process_prod.json ../dist/process_prod.json
+# Copy build files to fresh /dist directory
+cp ../src/package.json ../dist/package.json
+
+# Copy build files to fresh /dist directory
+cp ../src/workers/package.json ../dist/workers/package.json
 
 # Copy build files to fresh /dist directory
-cp ../package.json ../dist/package.json
+cp process_prod.json ../dist/process_prod.json
+
+# Copy email files to fresh /dist directory
+cp -R ../src/utils/email/templates ../dist/utils/email
+
+# Install node modules via yarn
+cd ../dist && yarn install --production --modules-folder node_modules
 
 # Install node modules via yarn
-cd ../dist && yarn install --modules-folder node_modules
+cd workers && yarn install --production --modules-folder node_modules
diff --git a/api/src/commands/winds.js b/api/src/commands/winds.js
@@ -2,7 +2,13 @@
 import program from 'commander';
 import logger from '../utils/logger';
 
-import { version } from '../../../app/package.json';
+let version;
+
+if (process.env.DOCKER) {
+	version = { version: 'DOCKER' };
+} else {
+	version = require('../../../app/package.json');
+}
 
 program
 	.version(version)

diff --git a/api/src/controllers/health.js b/api/src/controllers/health.js
@@ -9,7 +9,6 @@ import Queue from 'bull';
 import logger from '../utils/logger';
 
 let version;
-
 if (process.env.DOCKER) {
 	version = 'DOCKER';
 } else {

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Winds",
-  "version": "2.1.172",
+  "version": "2.1.173",
   "description": "Winds is a beatiful open source RSS Reader and Podcast app. Wind 2.0 was created using React/Redux/Node.\nFor more information, visit https://getstream.io/winds/.\nTo contribute or run your own version head over to Github: https://github.com/getstream/winds",
   "private": true,
   "author": "Winds Team <winds@getstream.io>",

diff --git a/app/src/components/ArticleListItem.js b/app/src/components/ArticleListItem.js
@@ -52,7 +52,7 @@ class ArticleListItem extends React.Component {
 							}}
 						>
 							{this.props.pinned ? (
-								<i className="fa fa-bookmark" />
+								<i className="fas fa-bookmark" />
 							) : (
 								<i className="far fa-bookmark" />
 							)}

diff --git a/app/src/components/RSSArticle.js b/app/src/components/RSSArticle.js
@@ -217,7 +217,7 @@ class RSSArticle extends React.Component {
 							}}
 						>
 							{this.props.pinned ? (
-								<i className="fa fa-bookmark" />
+								<i className="fas fa-bookmark" />
 							) : (
 								<i className="far fa-bookmark" />
 							)}

diff --git a/app/src/styles/components/_item-info.scss b/app/src/styles/components/_item-info.scss
@@ -24,6 +24,10 @@
 		color: $batman;
 		font-size: 1.5em;
 		font-weight: normal;
+
+		&.fa-bookmark.fas {
+			font-weight: 900;
+		}
 	}
 
 	.muted {

diff --git a/app/src/styles/global.css b/app/src/styles/global.css
@@ -187,11 +187,13 @@ textarea {
   top: 0;
   z-index: 100000; }
 
-.delete-account-confirmation-popover .message {
+.delete-account-confirmation-popover .message,
+.save-account-error-popover .message {
   font-size: 0.9em;
   font-weight: lighter; }
 
-.delete-account-confirmation-popover .menu-item {
+.delete-account-confirmation-popover .menu-item,
+.save-account-error-popover .menu-item {
   cursor: pointer; }
 
 label {
@@ -1073,6 +1075,8 @@ a.column-header:hover, .column-header:hover {
     color: #000;
     font-size: 1.5em;
     font-weight: normal; }
+    .item-info i.fa-bookmark.fas {
+      font-weight: 900; }
   .item-info .muted {
     color: #aaa; }
   .item-info a {