Skip to content

Commit

Permalink
Merge pull request #2066 from valory-xyz/feat/optimise-images
Browse files Browse the repository at this point in the history
Optimise images
  • Loading branch information
angrybayblade authored Sep 27, 2023
2 parents 01ef7ee + 2f739a7 commit 316e046
Show file tree
Hide file tree
Showing 66 changed files with 350 additions and 1,084 deletions.
18 changes: 18 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
# Release History - `open-autonomy`


# 0.13.0 (2023-09-27)

Autonomy:
- Replaces `open-aea-web3` with `web3py<7,>=6.0.0`
- Bumps `protobuf<5.0.0,>=4.21.6`
- Fixes `protobuf` incompatibility issue when importing hardware wallet plugin
- Refactors autonomy and agent images to
- Include install and build scripts in the base image
- Remove unwanted layers
- Remove unwanted data files

Packages:
- Generates protocols using the latest compatible `protobuf` compiler
- Compiles the tendermint connection protocol buffers using the latest compatible `protobuf` compiler

Chores:
- Bumps `protobuf` compiler to `24.3`

# 0.12.1.post4 (2023-09-25)

Autonomy:
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ The following table shows which versions of `open-autonomy` are currently being

| Version | Supported |
| --------- | ------------------ |
| `0.12.1.post4` | :white_check_mark: |
| `< 0.12.x` | :x: |
| `0.13.0` | :white_check_mark: |
| `< 0.13.x` | :x: |

## Reporting a Vulnerability

Expand Down
2 changes: 1 addition & 1 deletion autonomy/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
__title__ = "open-autonomy"
__description__ = "A framework for the creation of autonomous agent services."
__url__ = "https://github.com/valory-xyz/open-autonomy.git"
__version__ = "0.12.1.post4"
__version__ = "0.13.0"
__author__ = "Valory AG"
__license__ = "Apache-2.0"
__copyright__ = "2021-2022 Valory AG"
2 changes: 1 addition & 1 deletion autonomy/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@
ACN_IMAGE_NAME = os.environ.get("ACN_IMAGE_NAME", "valory/open-acn-node")
DEFAULT_DOCKER_IMAGE_AUTHOR = "valory"
OAR_IMAGE = "{image_author}/oar-{agent}:{version}"
ABSTRACT_ROUND_ABCI_SKILL_WITH_HASH = "valory/abstract_round_abci:0.1.0:bafybeihh7st2pmutpodau3u53i4kkexa6xj5d3ry3lnsehfb5s53u4he2q"
ABSTRACT_ROUND_ABCI_SKILL_WITH_HASH = "valory/abstract_round_abci:0.1.0:bafybeibrrgdzbpdqyirkfulg5bgkrdwlynezdheplm55xfhkrnlxgvluo4"
11 changes: 4 additions & 7 deletions autonomy/data/Dockerfiles/agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ FROM ${AUTONOMY_IMAGE_NAME}:${AUTONOMY_IMAGE_VERSION}
ARG AEA_AGENT
ARG AUTHOR

COPY start.sh /home/ubuntu
COPY install.sh /home/ubuntu
RUN aea init --reset --remote --ipfs --author ${AUTHOR}

VOLUME /home/ubuntu/logs
WORKDIR /home/ubuntu
WORKDIR /root

RUN aea init --reset --remote --ipfs --author ${AUTHOR}
RUN AEA_AGENT=${AEA_AGENT} bash install.sh
RUN AEA_AGENT=${AEA_AGENT} bash /root/scripts/install.sh

CMD ["start.sh"]
CMD ["/root/scripts/start.sh"]

HEALTHCHECK --interval=3s --timeout=600s --retries=600 CMD netstat -ltn | grep -c 26658 > /dev/null; if [ 0 != $? ]; then exit 1; fi;
28 changes: 11 additions & 17 deletions autonomy/data/Dockerfiles/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
ARG AEA_VERSION=latest
FROM valory/open-aea-user:${AEA_VERSION}
ARG AUTHOR=default_author

WORKDIR /home/ubuntu
ENV PATH=$PATH:/home/ubuntu/.local/bin
FROM valory/open-aea-user:${AEA_VERSION}

RUN sudo apt-get update && sudo apt-get upgrade -y
RUN cd /usr/bin && sudo rm python3 && sudo ln -s python3.10 python3 && sudo ln -s python3.10 python
RUN sudo apt-get install wait-for-it net-tools -y
RUN sudo apt remove --purge python3-virtualenv
ARG AUTHOR=default_author

RUN apt remove --purge python3-virtualenv
RUN python -m pip uninstall -y setuptools
RUN python -m pip install --upgrade pip
RUN python -m pip install --force-reinstall pipenv virtualenv --user
RUN python -m pip uninstall -y setuptools
WORKDIR /home/ubuntu

COPY openssl.cnf /etc/ssl
COPY Pipfile /home/ubuntu/Pipfile
COPY start_dev.sh /home/ubuntu/start_dev.sh
COPY start.sh /home/ubuntu/start.sh
COPY watcher.py /home/ubuntu/watcher.py
WORKDIR /root

CMD ["./start_dev.sh"]
COPY Pipfile /root/Pipfile
COPY start_dev.sh /root/start_dev.sh
COPY start.sh /root/start.sh
COPY watcher.py /root/watcher.py

HEALTHCHECK --interval=3s --timeout=600s --retries=600 CMD netstat -ltn | grep -c 26658 > /dev/null; if [ 0 != $? ]; then exit 1; fi;
CMD ["/root/start_dev.sh"]

HEALTHCHECK --interval=3s --timeout=600s --retries=600 CMD netstat -ltn | grep -c 26658 > /dev/null; if [ 0 != $? ]; then exit 1; fi;
Loading

0 comments on commit 316e046

Please sign in to comment.