Merge pull request #158 from BoostryJP/upgrade-alpine

Upgrade alpine and python
BoostryJP · Mar 12, 2024 · 11faff4 · 11faff4
2 parents 63bebd5 + 3dcdd20
commit 11faff4
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/ibet-for-fin-network/general/Dockerfile b/ibet-for-fin-network/general/Dockerfile
@@ -14,7 +14,7 @@ RUN cd quorum/ && \
     mv build/bin/bootnode /usr/local/bin
 
 # Pull Geth into a second stage deploy alpine container
-FROM python:3.9-alpine3.18
+FROM python:3.11-alpine3.19
 
 RUN apk add --no-cache --virtual .build-deps gcc g++
 RUN apk add --no-cache ca-certificates

diff --git a/ibet-for-fin-network/general/monitoring/monitor_block_sync.py b/ibet-for-fin-network/general/monitoring/monitor_block_sync.py
@@ -65,7 +65,7 @@ def monitor_block_sync(start_block_number):
     :return: Next monitoring start block number
     """
     try:
-        latest_block_number = web3.eth.blockNumber
+        latest_block_number = web3.eth.block_number
         if (
             latest_block_number - start_block_number > MINIMUM_INCREMENTAL_NUMBER
         ):  # Normal

diff --git a/ibet-for-fin-network/general/monitoring/requirements.txt b/ibet-for-fin-network/general/monitoring/requirements.txt
@@ -1 +1 @@
-web3==5.28.0
+web3==6.15.1
diff --git a/ibet-network/general/Dockerfile b/ibet-network/general/Dockerfile
@@ -14,7 +14,7 @@ RUN cd quorum/ && \
     mv build/bin/bootnode /usr/local/bin
 
 # Pull Geth into a second stage deploy alpine container
-FROM python:3.9-alpine3.18
+FROM python:3.11-alpine3.19
 
 RUN apk add --no-cache --virtual .build-deps gcc g++
 RUN apk add --no-cache ca-certificates

diff --git a/ibet-network/general/monitoring/monitor_block_sync.py b/ibet-network/general/monitoring/monitor_block_sync.py
@@ -65,7 +65,7 @@ def monitor_block_sync(start_block_number):
     :return: Next monitoring start block number
     """
     try:
-        latest_block_number = web3.eth.blockNumber
+        latest_block_number = web3.eth.block_number
         if (
             latest_block_number - start_block_number > MINIMUM_INCREMENTAL_NUMBER
         ):  # Normal

diff --git a/ibet-network/general/monitoring/requirements.txt b/ibet-network/general/monitoring/requirements.txt
@@ -1 +1 @@
-web3==5.28.0
+web3==6.15.1
diff --git a/local-network/general/Dockerfile b/local-network/general/Dockerfile
@@ -14,7 +14,7 @@ RUN cd quorum/ && \
     mv build/bin/bootnode /usr/local/bin
 
 # Pull Geth into a second stage deploy alpine container
-FROM python:3.9-alpine3.18
+FROM python:3.11-alpine3.19
 
 RUN apk add --no-cache --virtual .build-deps gcc g++
 RUN apk add --no-cache ca-certificates

diff --git a/local-network/general/monitoring/monitor_block_sync.py b/local-network/general/monitoring/monitor_block_sync.py
@@ -65,7 +65,7 @@ def monitor_block_sync(start_block_number):
     :return: Next monitoring start block number
     """
     try:
-        latest_block_number = web3.eth.blockNumber
+        latest_block_number = web3.eth.block_number
         if (
             latest_block_number - start_block_number > MINIMUM_INCREMENTAL_NUMBER
         ):  # Normal

diff --git a/local-network/general/monitoring/requirements.txt b/local-network/general/monitoring/requirements.txt
@@ -1 +1 @@
-web3==5.28.0
+web3==6.15.1
diff --git a/local-network/validator/Dockerfile b/local-network/validator/Dockerfile
@@ -14,7 +14,7 @@ RUN cd quorum/ && \
     mv build/bin/bootnode /usr/local/bin
 
 # Pull Geth into a second stage deploy alpine container
-FROM python:3.9-alpine3.18
+FROM python:3.11-alpine3.19
 
 RUN apk add --no-cache --virtual .build-deps gcc g++
 RUN apk add --no-cache ca-certificates

diff --git a/test-network/general/Dockerfile b/test-network/general/Dockerfile
@@ -14,7 +14,7 @@ RUN cd quorum/ && \
     mv build/bin/bootnode /usr/local/bin
 
 # Pull Geth into a second stage deploy alpine container
-FROM python:3.9-alpine3.18
+FROM python:3.11-alpine3.19
 
 RUN apk add --no-cache --virtual .build-deps gcc g++
 RUN apk add --no-cache ca-certificates

diff --git a/test-network/general/monitoring/monitor_block_sync.py b/test-network/general/monitoring/monitor_block_sync.py
@@ -65,7 +65,7 @@ def monitor_block_sync(start_block_number):
     :return: Next monitoring start block number
     """
     try:
-        latest_block_number = web3.eth.blockNumber
+        latest_block_number = web3.eth.block_number
         if (
             latest_block_number - start_block_number > MINIMUM_INCREMENTAL_NUMBER
         ):  # Normal

diff --git a/test-network/general/monitoring/requirements.txt b/test-network/general/monitoring/requirements.txt
@@ -1 +1 @@
-web3==5.28.0
+web3==6.15.1