Merge pull request #86 from YC/docker

docker: reduce image layers

.dockerignore

@@ -3,4 +3,8 @@ config*.yml
 !config.default.yml
 *.db
 *.exe
-wakapi
+wakapi
+Dockerfile
+docker-compose.yml
+.dockerignore
+.git*

Dockerfile

@@ -2,12 +2,21 @@
 
 FROM golang:1.15 AS build-env
 WORKDIR /src
+
 ADD ./go.mod .
 RUN go mod download
 
 ADD . .
 RUN go build -o wakapi
 
+WORKDIR /app
+RUN cp /src/wakapi . && \
+    cp /src/config.default.yml config.yml && \
+    sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' config.yml && \
+    cp /src/version.txt . && \
+    cp -r /src/static /src/data /src/migrations /src/views . && \
+    cp /src/wait-for-it.sh .
+
 # Run Stage
 
 # When running the application using `docker run`, you can pass environment variables
@@ -27,17 +36,7 @@ ENV WAKAPI_PASSWORD_SALT ''
 ENV WAKAPI_LISTEN_IPV4 '0.0.0.0'
 ENV WAKAPI_INSECURE_COOKIES 'true'
 
-COPY --from=build-env /src/wakapi /app/
-COPY --from=build-env /src/config.default.yml /app/config.yml
-COPY --from=build-env /src/version.txt /app/
-
-RUN sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' /app/config.yml
-
-ADD static /app/static
-ADD data /app/data
-ADD migrations /app/migrations
-ADD views /app/views
-ADD wait-for-it.sh .
+COPY --from=build-env /app .
 
 VOLUME /data
 

models/user.go

@@ -43,7 +43,7 @@ func (s *Signup) IsValid() bool {
 }
 
 func validateUsername(username string) bool {
-	return len(username) >= 3 && username != "current"
+	return len(username) >= 1 && username != "current"
 }
 
 func validatePassword(password string) bool {

version.txt

@@ -1 +1 @@
-1.18.1
+1.18.2

views/login.tpl.html

@@ -20,7 +20,7 @@
                 <label class="inline-block text-sm mb-1 text-gray-500" for="username">Username</label>
                 <input class="shadow appearance-none bg-gray-800 focus:bg-gray-700 text-gray-300 border-green-700 focus:border-gray-500 border rounded w-full py-1 px-3"
                        type="text" id="username"
-                       name="username" placeholder="Enter your username" minlength="3" required autofocus>
+                       name="username" placeholder="Enter your username" minlength="1" required autofocus>
             </div>
             <div class="mb-8">
                 <label class="inline-block text-sm mb-1 text-gray-500" for="password">Password</label>

views/signup.tpl.html

@@ -23,7 +23,7 @@
                                                                          rel="noopener noreferrer"
                                                                          class="border-b border-green-700">WakaTime</a>
                 client tools.
-                Please refer to <a href="https://github.com/muety/wakapi#client-setup" target="_blank"
+                Please refer to <a href="https://github.com/muety/wakapi#-client-setup" target="_blank"
                                    rel="noopener noreferrer"
                                    class="border-b border-green-700">this readme section</a> for instructions.
                 You will be able to view you <strong>API Key</strong> once you log in.
@@ -35,7 +35,7 @@
                 <label class="inline-block text-sm mb-1 text-gray-500" for="username">Username</label>
                 <input class="shadow appearance-none bg-gray-800 focus:bg-gray-700 text-gray-300 border-green-700 focus:border-gray-500 border rounded w-full py-1 px-3"
                        type="text" id="username"
-                       name="username" placeholder="Choose a username" minlength="3" required autofocus>
+                       name="username" placeholder="Choose a username" minlength="1" required autofocus>
             </div>
             <div class="mb-8">
                 <label class="inline-block text-sm mb-1 text-gray-500" for="password">Password</label>