Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-03-30 15:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-390] Add faucet dockerfile (#544)

Browse Source 
* [NOD-390] Add faucet Dockerfile

* [NOD-390] Allow running migration without -api-server-url and --private-key arguments

* [NOD-390] Change kasparov-server to kasparovd in its Dockerfile

* [NOD-390] Change API server and Kasparov server to kasparovd
This commit is contained in:
Ori Newman 2019-12-17 11:10:59 +02:00 committed by Svarog
parent 1cd2eb9308
commit 07651e51c8
7 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blockdag/process.go
View File

@ -78,10 +78,7 @@ func (dag *BlockDAG) processOrphans(hash *daghash.Hash, flags BehaviorFlags) err
processHashes = processHashes[1:]
// Look up all orphans that are parented by the block we just
// accepted. This will typically only be one, but it could
// be multiple if multiple blocks are mined and broadcast
// around the same time. The one with the most proof of work
// will eventually win out. An indexing for loop is
// accepted. An indexing for loop is
// intentionally used over a range here as range does not
// reevaluate the slice on each iteration nor does it adjust the
// index for the modified slice.

13
faucet/config/config.go
View File

@ -28,8 +28,8 @@ var (
type Config struct {
LogDir string `long:"logdir" description:"Directory to log output."`
HTTPListen string `long:"listen" description:"HTTP address to listen on (default: 0.0.0.0:8081)"`
APIServerURL string `long:"api-server-url" description:"The API server url to connect to" required:"true"`
PrivateKey string `long:"private-key" description:"Faucet Private key" required:"true"`
KasparovdURL string `long:"kasparovd-url" description:"The API server url to connect to"`
PrivateKey string `long:"private-key" description:"Faucet Private key"`
DBAddress string `long:"dbaddress" description:"Database address"`
DBUser string `long:"dbuser" description:"Database user" required:"true"`
DBPassword string `long:"dbpass" description:"Database password" required:"true"`
@ -56,6 +56,15 @@ func Parse() error {
return err
}
if !cfg.Migrate {
if cfg.KasparovdURL == "" {
return errors.New("api-server-url argument is required when --migrate flag is not raised")
}
if cfg.PrivateKey == "" {
return errors.New("private-key argument is required when --migrate flag is not raised")
}
}
err = resolveNetwork(cfg)
if err != nil {
return err

28
faucet/docker/Dockerfile Normal file
View File

@ -0,0 +1,28 @@
# -- multistage docker build: stage #1: build stage
FROM golang:1.13-alpine AS build
RUN mkdir -p /go/src/github.com/kaspanet/kaspad
WORKDIR /go/src/github.com/kaspanet/kaspad
RUN apk add --no-cache curl git
COPY go.mod .
COPY go.sum .
RUN go mod download
COPY . .
RUN cd faucet && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o faucet .
# --- multistage docker build: stage #2: runtime image
FROM alpine
WORKDIR /app
RUN apk add --no-cache tini
COPY --from=build /go/src/github.com/kaspanet/kaspad/faucet /app/
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["/app/faucet"]

2
faucet/faucet.go
View File

@ -40,7 +40,7 @@ func apiURL(requestPath string) (string, error) {
if err != nil {
return "", err
}
u, err := url.Parse(cfg.APIServerURL)
u, err := url.Parse(cfg.KasparovdURL)
if err != nil {
return "", errors.WithStack(err)
}

6
kasparov/kasparovd/config/config.go
View File

@ -7,13 +7,13 @@ import (
)
const (
logFilename = "apiserver.log"
errLogFilename = "apiserver_err.log"
logFilename = "kasparovd.log"
errLogFilename = "kasparovd_err.log"
)
var (
// Default configuration options
defaultLogDir = util.AppDataDir("apiserver", false)
defaultLogDir = util.AppDataDir("kasparovd", false)
defaultHTTPListen = "0.0.0.0:8080"
activeConfig *Config
)

4
kasparov/kasparovd/docker/Dockerfile
View File

@ -14,7 +14,7 @@ RUN go mod download
COPY . .
RUN cd kasparov/kasparovd && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o kasparov-server .
RUN cd kasparov/kasparovd && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o kasparovd .
# --- multistage docker build: stage #2: runtime image
FROM alpine
@ -26,4 +26,4 @@ COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/kasparovd/ /app/
COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/database/migrations/ /database/migrations/
ENTRYPOINT ["/sbin/tini", "--"]
CMD ["/app/kasparov-server"]
CMD ["/app/kasparovd"]

6
kasparov/kasparovsyncd/config/config.go
View File

@ -8,13 +8,13 @@ import (
)
const (
logFilename = "syncd.log"
errLogFilename = "syncd_err.log"
logFilename = "kasparov_syncd.log"
errLogFilename = "kasparov_syncd_err.log"
)
var (
// Default configuration options
defaultLogDir = util.AppDataDir("syncd", false)
defaultLogDir = util.AppDataDir("kasparov_syncd", false)
activeConfig *Config
)