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

fix: broken dependency causing Docker builds to fail #3102

Merged
merged 5 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-test-cvat-recording-oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
paths:
- 'packages/examples/cvat/recording-oracle/**'
- 'packages/sdk/python/human-protocol-sdk/**'
- 'packages/core/**'

jobs:
cvat-exo-test:
Expand Down
14 changes: 4 additions & 10 deletions packages/examples/cvat/recording-oracle/docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,26 @@ services:
POSTGRES_USER: 'test'
POSTGRES_DB: 'recording_oracle_test'
PGDATA: '/var/lib/postgresql/data/pgdata'
ports:
- 5434:5432
command: ["postgres", "-c", "log_statement=all"]
networks:
- test-network

blockchain-node:
build:
context: ./
dockerfile: dockerfiles/blockchain-node.Dockerfile
context: ../../../../
dockerfile: packages/examples/cvat/recording-oracle/dockerfiles/blockchain-node.Dockerfile
healthcheck:
# Using a magic nubmer of 23 here because this is a block number when blockchain-node container is ready to use
test: if [ $(( $(wget -q --post-data='{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' -O- http://blockchain-node:8545 | grep -o '"result":"[^"]*"' | awk -F'"' '{print $4}' ) )) -ge 23 ]; then exit 0; else exit 1; fi
test: if [ $(( $(wget -q --post-data='{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' -O- http://localhost:8545 | grep -o '"result":"[^"]*"' | awk -F'"' '{print $4}' ) )) -ge 23 ]; then exit 0; else exit 1; fi
interval: 15s
timeout: 5s
retries: 15
retries: 5
networks:
- test-network

minio:
container_name: minio
image: minio/minio:RELEASE.2022-05-26T05-48-41Z
ports:
- 9001:9001
- 9000:9000
environment:
MINIO_ROOT_USER: dev
MINIO_ROOT_PASSWORD: devdevdev
Expand Down Expand Up @@ -64,7 +59,6 @@ services:
networks:
- test-network


test:
build:
context: ./
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
FROM node:18-alpine
# TODO: make this shared and part of local setup
FROM node:18-slim

RUN apk add git
# wget is needed for healthcheck
RUN apt-get update && apt-get install -y wget

RUN git clone https://github.com/humanprotocol/human-protocol.git
WORKDIR /usr/src/app

WORKDIR /human-protocol

EXPOSE 8545
# Copy expected yarn dist
COPY .yarn ./.yarn
COPY .yarnrc ./
# Copy files for deps installation
COPY package.json yarn.lock ./

COPY tsconfig.json ./
COPY packages/core ./packages/core
RUN yarn workspace @human-protocol/core install --ignore-scripts
CMD yarn workspace @human-protocol/core local
RUN yarn workspace @human-protocol/core build

EXPOSE 8545
CMD yarn workspace @human-protocol/core local
17 changes: 5 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4260,12 +4260,12 @@
undici "^6.11.1"

"@openzeppelin/upgrades-core@^1.32.2", "@openzeppelin/upgrades-core@^1.41.0":
version "1.42.1"
resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.42.1.tgz#a2784e8d9c09f4a79b7e5cbb11933062ad709835"
integrity sha512-8qnz2XfQrco8R8u9NjV+KiSLrVn7DnWFd+3BuhTUjhVy0bzCSu2SMKCVpZLtXbxf4f2dpz8jYPQYRa6s23PhLA==
version "1.41.0"
resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.41.0.tgz#3a5e044cf53acd50c392f3297e7c37e4ff8f8355"
integrity sha512-+oryinqZnxkiZvg7bWqWX4Ki/CNwVUZEqC6Elpi5PQoahpL3/6Sq9xjIozD5AiI2O61h8JHQ+A//5NtczyavJw==
dependencies:
"@nomicfoundation/slang" "^0.18.3"
cbor "^10.0.0"
cbor "^9.0.0"
chalk "^4.1.0"
compare-versions "^6.0.0"
debug "^4.1.1"
Expand Down Expand Up @@ -9041,13 +9041,6 @@ caseless@^0.12.0, caseless@~0.12.0:
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==

cbor@^10.0.0:
version "10.0.3"
resolved "https://registry.yarnpkg.com/cbor/-/cbor-10.0.3.tgz#202d79cd696f408700af51b0c9771577048a860e"
integrity sha512-72Jnj81xMsqepqdcSdf2+fflz/UDsThOHy5hj2MW5F5xzHL8Oa0KQ6I6V9CwVUPxg5pf+W9xp6W2KilaRXWWtw==
dependencies:
nofilter "^3.0.2"

cbor@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/cbor/-/cbor-8.1.0.tgz#cfc56437e770b73417a2ecbfc9caf6b771af60d5"
Expand Down Expand Up @@ -15913,7 +15906,7 @@ node-stdlib-browser@^1.2.0:
util "^0.12.4"
vm-browserify "^1.0.1"

nofilter@^3.0.2, nofilter@^3.1.0:
nofilter@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66"
integrity sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==
Expand Down
Loading