Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redo Dockerfile generation #530

Merged
merged 46 commits into from
Feb 9, 2024
Merged
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
feae2cd
Delete all Dockerfile fragments, add new orchestator to generate Dock…
kayabaNerve Feb 4, 2024
d2e15f4
Use Dockerfiles from the orchestator
kayabaNerve Feb 4, 2024
92b20af
Ignore Dockerfiles in the git repo
kayabaNerve Feb 4, 2024
cab4d66
Remove CI job to check Dockerfiles are as expected now that they're n…
kayabaNerve Feb 4, 2024
31b25c9
Remove old Dockerfiles from repo
kayabaNerve Feb 4, 2024
d153fcb
Use Debian for monero-wallet-rpc
kayabaNerve Feb 4, 2024
65bd6c6
Remove replace_cmds for proper usage of entry-dev
kayabaNerve Feb 4, 2024
87154d4
Only write a new dockerfile if it's distinct
kayabaNerve Feb 4, 2024
738f846
Update serai-docker-tests
kayabaNerve Feb 4, 2024
3d6ffd1
Correct the path Dockerfiles are built from
kayabaNerve Feb 4, 2024
30c02db
Correct inclusion of orchestration folder in Docker builds
kayabaNerve Feb 4, 2024
f3bbbac
Correct debug/release flagging in the cargo command
kayabaNerve Feb 4, 2024
5c4a43c
Correct path used to run the Serai node within a Dockerfile
kayabaNerve Feb 4, 2024
0ed8fbf
Correct path in Monero Dockerfile
kayabaNerve Feb 4, 2024
9abb977
Attempt storing monerod in /usr/bin
kayabaNerve Feb 4, 2024
fc7f765
Use sudo to move into /usr/bin in CI
kayabaNerve Feb 4, 2024
f11ed68
Correct 18.3.0 to 18.3.1
kayabaNerve Feb 4, 2024
8806f2c
Escape * with quotes
kayabaNerve Feb 4, 2024
168cf84
Update deny.toml, ADD orchestration in runtime Dockerfile
kayabaNerve Feb 4, 2024
b897d4a
Add --detach to the Monero GH CI
kayabaNerve Feb 4, 2024
60098f5
Diversify dockerfiles by network
kayabaNerve Feb 4, 2024
105b1d6
Fixes to network-diversified orchestration
kayabaNerve Feb 4, 2024
7468898
Bitcoin and Monero testnet scripts
kayabaNerve Feb 4, 2024
9bdab21
Permissions and tweaks
kayabaNerve Feb 4, 2024
9ec4edc
Flatten scripts folders
kayabaNerve Feb 4, 2024
2f18b76
Add missing folder specification to Monero Dockerfile
kayabaNerve Feb 4, 2024
a7e6155
Have monero-wallet-rpc specify the monerod login
kayabaNerve Feb 4, 2024
2408017
Have the Docker CMD specify env variables inserted at time of Dockerf…
kayabaNerve Feb 5, 2024
36fe2db
Don't add Dockerfiles into Docker containers now that they have secrets
kayabaNerve Feb 5, 2024
a4aa7b0
Download arm64 Monero on arm64
kayabaNerve Feb 5, 2024
8fd6247
Ensure constant host architecture when reproducibly building the wasm
kayabaNerve Feb 5, 2024
497bb3b
Randomly generate infrastructure keys
kayabaNerve Feb 6, 2024
370a7bf
Have orchestrator generate a key, be able to create/start containers
kayabaNerve Feb 7, 2024
be87288
Ensure bash is used over sh
kayabaNerve Feb 7, 2024
95aa088
Clean dated docs
kayabaNerve Feb 7, 2024
22a3039
Change how quoting occurs
kayabaNerve Feb 7, 2024
bd3b563
Standardize to sh
kayabaNerve Feb 8, 2024
8e6d4df
Have Docker test build the dev Dockerfiles
kayabaNerve Feb 8, 2024
8af0fe1
Only key_gen once
kayabaNerve Feb 8, 2024
c8a2e3b
cargo update
kayabaNerve Feb 8, 2024
cc1d4f4
Use a dedicated network for Serai
kayabaNerve Feb 8, 2024
51edd82
Support providing a key over the env for the Serai node
kayabaNerve Feb 8, 2024
b60e2f1
Enable and document running daemons for tests via serai-orchestrator
kayabaNerve Feb 8, 2024
38c079c
Use volumes for bitcoin/monero
kayabaNerve Feb 8, 2024
0aa93e2
Use bitcoin's run.sh in GH CI
kayabaNerve Feb 8, 2024
1636d1d
Only use the volume for testnet (not dev)
kayabaNerve Feb 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/actions/bitcoin/action.yml
Original file line number Diff line number Diff line change
@@ -37,11 +37,4 @@ runs:

- name: Bitcoin Regtest Daemon
shell: bash
run: |
RPC_USER=serai
RPC_PASS=seraidex

bitcoind -txindex -regtest \
-rpcuser=$RPC_USER -rpcpassword=$RPC_PASS \
-rpcbind=127.0.0.1 -rpcbind=$(hostname) -rpcallowip=0.0.0.0/0 \
-daemon
run: PATH=$PATH:/usr/bin ./orchestration/dev/coins/bitcoin/run.sh -daemon
9 changes: 7 additions & 2 deletions .github/actions/monero-wallet-rpc/action.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ inputs:
version:
description: "Version to download and run"
required: false
default: v0.18.2.0
default: v0.18.3.1

runs:
using: "composite"
@@ -41,4 +41,9 @@ runs:

- name: Monero Wallet RPC
shell: bash
run: ./monero-wallet-rpc --disable-rpc-login --rpc-bind-port 6061 --allow-mismatched-daemon-version --wallet-dir ./ --detach
run: |
./monero-wallet-rpc --allow-mismatched-daemon-version \
--daemon-address 0.0.0.0:18081 --daemon-login serai:seraidex \
--disable-rpc-login --rpc-bind-port 18082 \
--wallet-dir ./ \
--detach
10 changes: 6 additions & 4 deletions .github/actions/monero/action.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ inputs:
version:
description: "Version to download and run"
required: false
default: v0.18.2.0
default: v0.18.3.1

runs:
using: "composite"
@@ -14,7 +14,7 @@ runs:
id: cache-monerod
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
with:
path: monerod
path: /usr/bin/monerod
key: monerod-${{ runner.os }}-${{ runner.arch }}-${{ inputs.version }}

- name: Download the Monero Daemon
@@ -37,8 +37,10 @@ runs:
wget https://downloads.getmonero.org/cli/$FILE
tar -xvf $FILE

mv monero-x86_64-linux-gnu-${{ inputs.version }}/monerod monerod
sudo mv monero-x86_64-linux-gnu-${{ inputs.version }}/monerod /usr/bin/monerod
sudo chmod 777 /usr/bin/monerod
sudo chmod +x /usr/bin/monerod

- name: Monero Regtest Daemon
shell: bash
run: ./monerod --regtest --offline --fixed-difficulty=1 --detach
run: PATH=$PATH:/usr/bin ./orchestration/dev/coins/monero/run.sh --detach
2 changes: 1 addition & 1 deletion .github/actions/test-dependencies/action.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ inputs:
monero-version:
description: "Monero version to download and run as a regtest node"
required: false
default: v0.18.2.0
default: v0.18.3.1

bitcoin-version:
description: "Bitcoin version to download and run as a regtest node"
2 changes: 1 addition & 1 deletion .github/nightly-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2024-02-01
nightly-2024-02-07
6 changes: 2 additions & 4 deletions .github/workflows/coordinator-tests.yml
Original file line number Diff line number Diff line change
@@ -9,9 +9,8 @@ on:
- "crypto/**"
- "coins/**"
- "message-queue/**"
- "orchestration/message-queue/**"
- "coordinator/**"
- "orchestration/coordinator/**"
- "orchestration/**"
- "tests/docker/**"
- "tests/coordinator/**"

@@ -21,9 +20,8 @@ on:
- "crypto/**"
- "coins/**"
- "message-queue/**"
- "orchestration/message-queue/**"
- "coordinator/**"
- "orchestration/coordinator/**"
- "orchestration/**"
- "tests/docker/**"
- "tests/coordinator/**"

8 changes: 0 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -73,14 +73,6 @@ jobs:
- name: Run rustfmt
run: cargo +${{ steps.nightly.outputs.version }} fmt -- --check

dockerfiles:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- name: Verify Dockerfiles are up to date
# Runs the file which generates them and checks the diff has no lines
run: cd orchestration && ./dockerfiles.sh && git diff | wc -l | grep -x "0"

machete:
runs-on: ubuntu-latest
steps:
4 changes: 2 additions & 2 deletions .github/workflows/message-queue-tests.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
- "common/**"
- "crypto/**"
- "message-queue/**"
- "orchestration/message-queue/**"
- "orchestration/**"
- "tests/docker/**"
- "tests/message-queue/**"

@@ -17,7 +17,7 @@ on:
- "common/**"
- "crypto/**"
- "message-queue/**"
- "orchestration/message-queue/**"
- "orchestration/**"
- "tests/docker/**"
- "tests/message-queue/**"

6 changes: 2 additions & 4 deletions .github/workflows/processor-tests.yml
Original file line number Diff line number Diff line change
@@ -9,9 +9,8 @@ on:
- "crypto/**"
- "coins/**"
- "message-queue/**"
- "orchestration/message-queue/**"
- "processor/**"
- "orchestration/processor/**"
- "orchestration/**"
- "tests/docker/**"
- "tests/processor/**"

@@ -21,9 +20,8 @@ on:
- "crypto/**"
- "coins/**"
- "message-queue/**"
- "orchestration/message-queue/**"
- "processor/**"
- "orchestration/processor/**"
- "orchestration/**"
- "tests/docker/**"
- "tests/processor/**"

5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
target
.vscode
Dockerfile
!orchestration/runtime/Dockerfile
.test-logs

.vscode
Loading