Cleanups for Dockerization

This commit is contained in:
Peter Stuifzand 2019-03-12 22:50:29 +01:00
parent 6b8235c36b
commit 7617f47ba0
4 changed files with 15 additions and 4 deletions

6
Dockerfile Normal file
View File

@ -0,0 +1,6 @@
FROM alpine
EXPOSE 80
RUN ["mkdir", "/data"]
WORKDIR /data
COPY track-me /app/
ENTRYPOINT ["/app/track-me"]

View File

@ -5,6 +5,7 @@ import (
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"os"
"p83.nl/go/indieauth" "p83.nl/go/indieauth"
) )
@ -120,7 +121,7 @@ func (h *IndieAuthHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
log.Println(authURL) log.Println(authURL)
state := RandStringBytes(16) state := RandStringBytes(16)
redirectURI := fmt.Sprintf("%s/auth/callback", "http://localhost:8096") redirectURI := fmt.Sprintf("%s/auth/callback", os.Getenv("TRACKME_HOST"))
sess.AuthorizationEndpoint = endpoints.AuthorizationEndpoint sess.AuthorizationEndpoint = endpoints.AuthorizationEndpoint
sess.Me = meURL.String() sess.Me = meURL.String()

View File

@ -10,7 +10,7 @@ import (
) )
func init() { func init() {
log.SetFlags(log.LstdFlags|log.Lshortfile) log.SetFlags(log.LstdFlags | log.Lshortfile)
} }
const DBFilename = "./moments.db" const DBFilename = "./moments.db"
@ -37,6 +37,5 @@ func main() {
http.Handle("/auth/", http.StripPrefix("/auth/", &IndieAuthHandler{})) http.Handle("/auth/", http.StripPrefix("/auth/", &IndieAuthHandler{}))
http.Handle("/", &indexHandler{DB: db}) http.Handle("/", &indexHandler{DB: db})
http.Handle("/moment", &momentHandler{DB: db}) http.Handle("/moment", &momentHandler{DB: db})
log.Fatal(http.ListenAndServe(":8096", nil)) log.Fatal(http.ListenAndServe(":8095", nil))
} }

View File

@ -2,10 +2,15 @@ package main
import ( import (
"math/rand" "math/rand"
"time"
) )
const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
func init() {
rand.Seed(time.Now().Unix())
}
func RandStringBytes(n int) string { func RandStringBytes(n int) string {
b := make([]byte, n) b := make([]byte, n)
for i := range b { for i := range b {