Merge pull request #311 from YujithIsura/master

local timezone added for docker file and miner bug fixed in nomination payment
ECLK · Mar 23, 2020 · 254b129 · 254b129
2 parents ed4c13d + 96d75ad
commit 254b129
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -11,6 +11,8 @@ ENV REACT_APP_PDF_GENARATION_SERVICE_URL=https://apim-gateway.ecdev.opensource.l
 ENV REACT_APP_AUTH_BASE_URL=https://nominations.ecdev.opensource.lk
 ENV REACT_APP_NOMINATION_URL=https://nominations.ecdev.opensource.lk
 RUN npm run build
+RUN rm /etc/localtime
+RUN ln -s /usr/share/zoneinfo/Asia/Colombo /etc/localtime
 
 FROM nginx:1.15
 

diff --git a/client/src/components/NominationPaymentUpdate/index.js b/client/src/components/NominationPaymentUpdate/index.js
@@ -298,7 +298,7 @@ class NominationPayments extends React.Component {
                if(party_type === 'RPP'){
                  party_type='candidate payment rpp';
                 this.setState({partyType:'candidate payment rpp'});
-               }else if (party_type === 'IG') {
+               }else if (party_type === 'IND') {
                 party_type='candidate payment ig';
                 this.setState({partyType:'candidate payment ig'});
                }

diff --git a/server/Dockerfile b/server/Dockerfile
@@ -45,6 +45,8 @@ COPY --from=build /home/builder/Nomination/build/ /home/lsf/Nomination/build/
 COPY --from=build /home/builder/Nomination/src/config/development.json /home/lsf/Nomination/prod.json 
 RUN chown lsf:lsf /home/lsf/Nomination/build/uploads
 RUN chown lsf:lsf /home/lsf/Nomination/build/partySymbols
+RUN rm /etc/localtime
+RUN ln -s /usr/share/zoneinfo/Asia/Colombo /etc/localtime
 
 ENV APP_ID 'nomination-api'