Compare commits
3 Commits
lash/ssh-f
...
v0.8.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
824d39908b
|
|||
|
a312ea5b84
|
|||
|
4836162f40
|
@@ -1,5 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
!/cmd/africastalking
|
!/cmd/africastalking
|
||||||
|
!/cmd/ssh
|
||||||
!/common
|
!/common
|
||||||
!/config
|
!/config
|
||||||
!/initializers
|
!/initializers
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ WORKDIR /build
|
|||||||
RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
|
RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
|
||||||
RUN go mod download
|
RUN go mod download
|
||||||
RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
|
RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
|
||||||
|
RUN go build -tags logtrace -o ussd-ssh -ldflags="-X main.build=${BUILD} -s -w" cmd/ssh/main.go
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
|
|||||||
WORKDIR /service
|
WORKDIR /service
|
||||||
|
|
||||||
COPY --from=build /build/ussd-africastalking .
|
COPY --from=build /build/ussd-africastalking .
|
||||||
|
COPY --from=build /build/ussd-ssh .
|
||||||
COPY --from=build /build/LICENSE .
|
COPY --from=build /build/LICENSE .
|
||||||
COPY --from=build /build/README.md .
|
COPY --from=build /build/README.md .
|
||||||
COPY --from=build /build/services ./services
|
COPY --from=build /build/services ./services
|
||||||
@@ -37,5 +39,6 @@ COPY --from=build /build/.env.example .
|
|||||||
RUN mv .env.example .env
|
RUN mv .env.example .env
|
||||||
|
|
||||||
EXPOSE 7123
|
EXPOSE 7123
|
||||||
|
EXPOSE 7122
|
||||||
|
|
||||||
CMD ["./ussd-africastalking"]
|
CMD ["./ussd-africastalking"]
|
||||||
@@ -4,9 +4,9 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"path"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"path"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
@@ -18,10 +18,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
wg sync.WaitGroup
|
wg sync.WaitGroup
|
||||||
keyStore db.Db
|
keyStore db.Db
|
||||||
logg = logging.NewVanilla()
|
logg = logging.NewVanilla()
|
||||||
scriptDir = path.Join("services", "registration")
|
scriptDir = path.Join("services", "registration")
|
||||||
|
|
||||||
|
build = "dev"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -76,7 +78,7 @@ func main() {
|
|||||||
fmt.Fprintf(os.Stderr, "keystore file open error: %v", err)
|
fmt.Fprintf(os.Stderr, "keystore file open error: %v", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
defer func () {
|
defer func() {
|
||||||
logg.TraceCtxf(ctx, "shutdown auth key store reached")
|
logg.TraceCtxf(ctx, "shutdown auth key store reached")
|
||||||
err = authKeyStore.Close()
|
err = authKeyStore.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -90,14 +92,14 @@ func main() {
|
|||||||
signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
|
signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
|
||||||
|
|
||||||
runner := &ssh.SshRunner{
|
runner := &ssh.SshRunner{
|
||||||
Cfg: cfg,
|
Cfg: cfg,
|
||||||
Debug: engineDebug,
|
Debug: engineDebug,
|
||||||
FlagFile: pfp,
|
FlagFile: pfp,
|
||||||
DbDir: dbDir,
|
DbDir: dbDir,
|
||||||
ResourceDir: resourceDir,
|
ResourceDir: resourceDir,
|
||||||
SrvKeyFile: sshKeyFile,
|
SrvKeyFile: sshKeyFile,
|
||||||
Host: host,
|
Host: host,
|
||||||
Port: port,
|
Port: port,
|
||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
select {
|
select {
|
||||||
@@ -109,7 +111,7 @@ func main() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
logg.ErrorCtxf(ctx, "runner stop error", "err", err)
|
logg.ErrorCtxf(ctx, "runner stop error", "err", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
}()
|
}()
|
||||||
runner.Run(ctx, authKeyStore)
|
runner.Run(ctx, authKeyStore)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user