Quellcode durchsuchen

Update readme. Update dockerfile to reflect ENV change

Tone vor 3 Jahren
Ursprung
Commit
6c5ddf0b55
3 geänderte Dateien mit 17 neuen und 11 gelöschten Zeilen
  1. 1 1
      Dockerfile
  2. 6 2
      README.md
  3. 10 8
      cmd/serve.go

+ 1 - 1
Dockerfile

@@ -9,6 +9,6 @@ COPY sakuin .
 EXPOSE 3000
 VOLUME ["/data"]
 
-ENV SAKUIN_DATA_DIR="${SAKUIN_DATA_DIR:-/data}"
+ENV SAKUIN_DATA="${SAKUIN_DATA_DIR:-/data}"
 
 ENTRYPOINT ["/app/sakuin", "serve"]

+ 6 - 2
README.md

@@ -5,7 +5,11 @@ It exposes your files from a given directory, simply and nicely.
 ## Building
 
 ```
-go build -o build/sakuin
+cd web/
+yarn install && yarn compile
+cd ../
+go get -v ./...
+go build -v ./...
 ```
 
 ## Usage
@@ -28,6 +32,6 @@ Flags:
 ## Building Docker image
 
 ```
-GOOS=linux go build -o build/sakuin
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v ./...
 docker build .
 ```

+ 10 - 8
cmd/serve.go

@@ -64,29 +64,31 @@ var serveCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(serveCmd)
-	serveCmd.Flags().StringP("data-dir", "d", "", "Directory containing data that Sakuin will serve")
+	serveCmd.Flags().StringP("data", "d", "", "Directory containing data that Sakuin will serve")
 	serveCmd.Flags().IntP("port", "p", 3000, "Port to listen to")
-	serveCmd.Flags().String("listen-addr", "0.0.0.0", "Address to listen to")
+	serveCmd.Flags().String("listen", "0.0.0.0", "Address to listen to")
 
-	viper.BindPFlag("data-dir", serveCmd.Flags().Lookup("data-dir"))
+	viper.BindPFlag("data", serveCmd.Flags().Lookup("data"))
 	viper.BindPFlag("port", serveCmd.Flags().Lookup("port"))
-	viper.BindPFlag("listen-addr", serveCmd.Flags().Lookup("listen-addr"))
+	viper.BindPFlag("listen", serveCmd.Flags().Lookup("listen"))
 }
 
 func serve(cmd *cobra.Command, args []string) {
-	dataDir = viper.GetString("data-dir")
+	dataDir = viper.GetString("data")
 
 	if dataDir == "" {
-		log.Fatal().Err(errors.New("please specify a data directory, can't be empty"))
+		log.Fatal().Err(errors.New("please specify a data directory, can't be empty")).Msg("")
 	}
 
 	_, err := os.Stat(dataDir)
 	if err != nil {
 		if os.IsNotExist(err) {
-			log.Fatal().Err(errors.New("please specify a valid data directory"))
+			log.Fatal().Err(errors.New("please specify a valid data directory")).Msg("")
 		}
 	}
 
+	log.Info().Msgf("Sakuin will serve this directory: %s", dataDir)
+
 	middleware := alice.New()
 
 	// Install the logger handler with default output on the console
@@ -112,7 +114,7 @@ func serve(cmd *cobra.Command, args []string) {
 	assetsHandler := middleware.Then(web.AssetsHandler("/assets/", "dist"))
 
 	port := viper.GetInt("port")
-	address := viper.GetString("listen-addr")
+	address := viper.GetString("listen")
 
 	mux := http.NewServeMux()
 	mux.Handle("/assets/", assetsHandler)