fix: devops / net-test

This commit is contained in:
Ludo Galabru
2021-01-19 18:54:42 -05:00
parent 9dc54762c6
commit 3336b8b3b9
7 changed files with 19 additions and 19 deletions

View File

@@ -1,3 +1,3 @@
[alias]
testnet = "run --package stacks-node --"
bitcoin-neon-controller = "run --package bitcoin-neon-controller --"
puppet-chain = "run --package puppet-chain --"

16
.vscode/launch.json vendored
View File

@@ -58,15 +58,15 @@
{
"type": "lldb",
"request": "launch",
"name": "executable 'bitcoin-neon-controller'",
"name": "executable 'puppet-chain'",
"cargo": {
"args": [
"build",
"--bin=bitcoin-neon-controller",
"--package=bitcoin-neon-controller"
"--bin=puppet-chain",
"--package=puppet-chain"
],
"filter": {
"name": "bitcoin-neon-controller",
"name": "puppet-chain",
"kind": "bin"
}
},
@@ -189,16 +189,16 @@
{
"type": "lldb",
"request": "launch",
"name": "unit tests in executable 'bitcoin-neon-controller'",
"name": "unit tests in executable 'puppet-chain'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=bitcoin-neon-controller",
"--package=bitcoin-neon-controller"
"--bin=puppet-chain",
"--package=puppet-chain"
],
"filter": {
"name": "bitcoin-neon-controller",
"name": "puppet-chain",
"kind": "bin"
}
},

View File

@@ -13,10 +13,10 @@ RUN apk add --no-cache musl-dev
RUN mkdir /out
RUN cd testnet/stacks-node && cargo build --features monitoring_prom,slog_json --release
RUN cd testnet/bitcoin-neon-controller && cargo build --release
RUN cd testnet/puppet-chain && cargo build --release
RUN cp target/release/stacks-node /out
RUN cp target/release/bitcoin-neon-controller /out
RUN cp target/release/puppet-chain /out
FROM alpine

View File

@@ -11,10 +11,10 @@ COPY . .
RUN mkdir /out
RUN cd testnet/stacks-node && cargo build --features monitoring_prom,slog_json --release
RUN cd testnet/bitcoin-neon-controller && cargo build --release
RUN cd testnet/puppet-chain && cargo build --release
RUN cp target/release/stacks-node /out
RUN cp target/release/bitcoin-neon-controller /out
RUN cp target/release/puppet-chain /out
FROM debian:stretch-slim

View File

@@ -11,5 +11,5 @@ Relevant files:
files.
To use, you will need to install `stacks-node`, `blockstack-cli`,
`bitcoin-neon-controller`, and `bin/faucet.sh` to somewhere in your `$PATH`.
`puppet-chain`, and `bin/faucet.sh` to somewhere in your `$PATH`.
You will also need a recent `bitcoind` and `bitcoin-cli`.

View File

@@ -67,7 +67,7 @@ start_bitcoind_controller() {
logln "ok"
log "[$$] Starting bitcoind controller..."
bitcoin-neon-controller "$BITCOIN_CONTROLLER_CONF" >"$BITCOIN_CONTROLLER_LOGFILE" 2>&1 &
puppet-chain "$BITCOIN_CONTROLLER_CONF" >"$BITCOIN_CONTROLLER_LOGFILE" 2>&1 &
local RC=$?
local BITCOIN_NEON_CONTROLLER_PID=$!
@@ -494,7 +494,7 @@ report() {
is_sourced
if [ $? -ne 0 ]; then
for cmd in bitcoind bitcoin-cli bitcoin-neon-controller stacks-node blockstack-cli date jq grep sed kill cat curl faucet.sh seq; do
for cmd in bitcoind bitcoin-cli puppet-chain stacks-node blockstack-cli date jq grep sed kill cat curl faucet.sh seq; do
which $cmd 2>&1 >/dev/null || exit_error "Missing \"$cmd\""
done

View File

@@ -13,7 +13,7 @@ RUN CC=musl-gcc \
FROM alpine
WORKDIR /
COPY --from=builder /src/target/x86_64-unknown-linux-musl/release/bitcoin-neon-controller /bin/
COPY config.toml.default /etc/bitcoin-neon-controller/Config.toml
COPY --from=builder /src/target/x86_64-unknown-linux-musl/release/puppet-chain /bin/
COPY config.toml.default /etc/puppet-chain/Config.toml
EXPOSE 3000
CMD ["/bin/bitcoin-neon-controller", "/etc/bitcoin-neon-controller/Config.toml"]
CMD ["/bin/puppet-chain", "/etc/puppet-chain/Config.toml"]