Merge pull request #3 from cig0/stage

cig0 · web-flow · commit 3f9221106714 · 2019-05-11T01:37:52.000-03:00
Prod
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG GOLANG_VER=1.12.4-stretch
-ARG ALPINE_VER=3.9.3
+ARG ALPINE_VER=3.9.4
 
 ## Stage 0: build Go executable from code and templates
 FROM golang:${GOLANG_VER} as builder
@@ -15,8 +15,6 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
     mkdir -p /go/src/github.com/cig0 && \
     ln -sf /go/src/app /go/src/github.com/cig0/tornote
 
-VOLUME /go/src/app/
-
 RUN make install
 
 ## Stage 1: grab compiled binary
@@ -35,10 +33,8 @@ RUN apk add --update sqlite && \
     mkdir /lib64 && \
     ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
 
-VOLUME /go/src/app/
-
 USER limited
 
 EXPOSE 8080
 
-CMD ["tornote", "-addr", ":8080"]
+ENTRYPOINT ["tornote", "-addr", ":8080"]
diff --git a/README.md b/README.md
@@ -21,8 +21,8 @@ If you have ideas to improve safety/security please open a new issue.
 ## Running with Docker
 
 ```bash
-$ docker build -t tornote-app .
-$ docker run -p 80:8080 --name tornote tornote-app
+$ docker build --no-cache -t tornote .
+$ docker run --name tornote -p 80:8080/tcp --memory 10m --memory-reservation 8m --cpus 0.10 tornote
 ```
 
 ## License
diff --git a/templates/index.html b/templates/index.html
@@ -4,7 +4,7 @@
 <!-- Warning -->
 <noscript>
     <div id="warn" class="alert alert-danger" role="alert">
-        <strong>Warning!</strong> You must enable JavaScript because all encryption going inside web browser.
+        <strong>Warning!</strong> You must enable JavaScript since encryption happens inside your web browser.
     </div>
 </noscript>
 
@@ -13,15 +13,15 @@
     <form id="note" action="/note" method="post">
         <div class="form-group">
             <label for="note">
-                Write your note below
-                <span class="glyphicon glyphicon-edit small"></span>:
+                Write your secure note below
+                <span class="glyphicon glyphicon-edit small"></span>
             </label>
-            <textarea class="form-control" name="body" cols="80" rows="4"></textarea>
+            <textarea class="form-control" name="body" cols="80" rows="16"></textarea>
             <p class="help-block">
                 Text will be encrypted with
                 <a href="https://en.wikipedia.org/wiki/Advanced_Encryption_Standard">AES-256</a>
                 <span class="glyphicon glyphicon-lock small"></span>
-                algorithm and secret (generated on client-side).
+                algorithm and a secret generated on your browser.
             </p>
         </div>
         <div class="form-group text-center">
@@ -36,7 +36,7 @@
 <!-- Secret link -->
 <div id="done" class="hidden">
     <div class="form-group">
-        <label for="secret_link">Your secret message available on the link:</label>
+        <label for="secret_link">Your secret message is available at:</label>
         <pre id="secret_link"></pre>
     </div>
     <div class="form-group text-center">
diff --git a/templates/layout/base.html b/templates/layout/base.html
@@ -5,17 +5,17 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="Anonymous self-destructing notes written in Go.">
+    <meta name="description" content="Anonymous self-destructing notes">
     <meta name="author" content="">
 
     <title>Tornote - {{ template "title" . }}</title>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
-          integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
           crossorigin="anonymous">
     <link rel="stylesheet" href="/public/styles.css">
 
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
 </head>
 <body>
 
diff --git a/templates/note.html b/templates/note.html
@@ -1,17 +1,20 @@
-{{ define "title" }}Anonymous Self-destructing Notes{{ end }}
+{{ define "title" }}Anonymous self-destructing notes{{ end }}
 
 {{ define "content" }}
 <div class="form-group">
-    <label for="secret_note">
-        This note permanently deleted after reading
-        <span class="glyphicon glyphicon-fire"></span>:
-    </label>
+    <label for="secret_note">Here is your secret message:</label>
     <pre id="secret_note" class="hidden">{{.}}</pre>
+    <p align='center'>The note on the server has already been destroyed
+        <span class="glyphicon glyphicon-fire"></span>
+    </p>
+    <p align='center'>
+        <em>You won't be able to access this data anymore!</em>
+    </p>
 </div>
 <div class="form-group text-center">
     <a href="/" class="btn btn-lg btn-success">
         <span class="glyphicon glyphicon-record small"></span>
         Create another note
     </a>
 </div>
-{{ end }}
+{{ end }}
