Merge pull request #1139 from valory-xyz/fix/release-images

Fix/release images

.github/workflows/main_workflow.yml

@@ -187,7 +187,7 @@ jobs:
           sudo mv tendermint /usr/local/bin/tendermint
 
           # install skaffold
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.33.0/skaffold-linux-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.39.1/skaffold-linux-amd64 && \
           sudo chmod +x skaffold
           sudo install skaffold /usr/local/bin/
           skaffold --help
@@ -249,7 +249,7 @@ jobs:
           sudo mv tendermint /usr/local/bin/tendermint
 
           # install skaffold
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.33.0/skaffold-darwin-amd64 && \
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.39.1/skaffold-darwin-amd64 && \
           sudo chmod +x skaffold
           sudo install skaffold /usr/local/bin/
           skaffold --help
@@ -313,7 +313,7 @@ jobs:
           cp tendermint.exe C:\Users\runneradmin\go\bin\
 
           # install skaffold
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-windows-amd64.exe
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.39.1/skaffold-windows-amd64.exe
           cp skaffold C:\Users\runneradmin\go\bin\
           skaffold --help
 
@@ -414,7 +414,7 @@ jobs:
             yarn
 
           # install Skaffold needed in order to build the Flask with Tendermint image
-          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.33.0/skaffold-linux-amd64 &&\
+          curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v1.39.1/skaffold-linux-amd64 &&\
             sudo install skaffold /usr/local/bin/
 
       - name: Unit tests

.gitignore

@@ -1,5 +1,3 @@
-deployments/Dockerfiles/open_aea/packages
-deployments/persistent_data
 # Local .terraform directories
 kubeconfig
 aws_creds

HISTORY.md

@@ -3,7 +3,8 @@
 # 0.1.5 (2022-07-29)
 
 Autonomy:
-- 
+- Depends on `open-aea>=1.14.0.post1`
+- Cleans up Dockerfiles and aligns them
 
 Packages:
 - Adds support to handle the `{'code': -32000, 'message': 'already known'}` response in the `transaction_settlement_abci`
@@ -27,6 +28,9 @@ Docs:
 - Adds various fixes and consistency improvements
 - Lists relevant dependencies and their versions
 
+Misc:
+- Cleans up skaffold and Dockerfiles
+
 
 # 0.1.4 (2022-07-20)
 

Makefile

@@ -11,7 +11,6 @@ clean-build:
 	rm -fr build/
 	rm -fr dist/
 	rm -fr .eggs/
-	rm -fr deployments/Dockerfiles/open_aea/packages
 	rm -fr pip-wheel-metadata
 	find . -name '*.egg-info' -exec rm -fr {} +
 	find . -name '*.egg' -exec rm -fr {} +
@@ -119,7 +118,7 @@ pylint:
 
 .PHONY: static
 static:
-	mypy autonomy packages/valory scripts deployments --disallow-untyped-defs
+	mypy autonomy packages/valory scripts --disallow-untyped-defs
 	mypy tests --disallow-untyped-defs
 
 .PHONY: package_checks
@@ -427,3 +426,7 @@ check_abci_specs:
 	python -m autonomy.cli analyse abci generate-app-specs packages.valory.skills.transaction_settlement_abci.rounds.TransactionSubmissionAbciApp packages/valory/skills/transaction_settlement_abci/fsm_specification.yaml || (echo "Failed to check transaction_settlement_abci consistency" && exit 1)
 	echo "Successfully validated abcis!"
 
+
+AEA_AGENT:=valory/hello_world:latest:$(shell cat packages/hashes.csv | grep "agents/hello_world" | cut -d "," -f2 )
+release-images:
+	AEA_AGENT=${AEA_AGENT} skaffold build -p release && VERSION=latest AEA_AGENT=${AEA_AGENT} skaffold build -p release

README.md

@@ -19,7 +19,7 @@ Ensure your machine satisfies the following requirements:
 - [Kubectl](https://kubernetes.io/docs/tasks/tools/)
 - [Docker Engine](https://docs.docker.com/engine/install/)
 - [Docker Compose](https://docs.docker.com/compose/install/)
-- [Skaffold](https://skaffold.dev/docs/install/#standalone-binary)
+- [Skaffold](https://skaffold.dev/docs/install/#standalone-binary) `>= 1.39.1`
 
 ## For developers using the framework: Get started developing
 

autonomy/data/Dockerfiles/agent/Dockerfile

@@ -1,5 +1,6 @@
-FROM valory/open-aea-user:latest
-
+ARG AEA_VERSION=latest
+FROM valory/open-aea-user:${AEA_VERSION}
+ARG AUTHOR=default_author
 ARG AEA_AGENT
 
 COPY openssl.cnf /etc/ssl
@@ -13,20 +14,20 @@ RUN sudo apt-get update --fix-missing
 RUN sudo apt-get autoremove
 RUN sudo apt-get autoclean
 RUN sudo apt-get install python3.10 python3.10-dev git -y
-RUN sudo apt-get install net-tools subversion -y
-
 RUN cd /usr/bin && sudo rm python3 && sudo ln -s python3.10 python3 && sudo ln -s python3.10 python
+# used in Docker-compose to wait until Hardhat node is up
+RUN sudo apt-get install net-tools -y
 RUN python -m pip install --upgrade pip
 
 WORKDIR /home/ubuntu
 
 RUN python -m pip install --force-reinstall pipenv virtualenv --user
 RUN sudo pipenv --python 3.10
 RUN pipenv install --system --skip-lock
-RUN aea init --reset --remote --ipfs --author default_author
-
+RUN aea init --reset --remote --ipfs --author ${AUTHOR}
 
 VOLUME /home/ubuntu/logs
+
 RUN INSTALL=1 VALORY_APPLICATION=${AEA_AGENT} bash start.sh
 CMD ["start.sh"]
 

autonomy/data/Dockerfiles/dev/Dockerfile

@@ -1,5 +1,6 @@
 ARG AEA_VERSION=latest
 FROM valory/open-aea-user:${AEA_VERSION}
+ARG AUTHOR=default_author
 
 MAINTAINER Valory AG
 
@@ -20,6 +21,8 @@ RUN python -m pip install --force-reinstall pipenv virtualenv --user
 RUN python -m pip uninstall -y setuptools
 WORKDIR /home/ubuntu
 
+RUN aea init --reset --local --ipfs --author ${AUTHOR}
+
 
 COPY start_dev.sh /home/ubuntu/start_dev.sh
 COPY start.sh /home/ubuntu/start.sh

autonomy/data/Dockerfiles/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta6
+apiVersion: skaffold/v2beta29
 kind: Config
 metadata:
   name: open-autonomy
@@ -12,7 +12,7 @@ build:
     docker:
       dockerfile: Dockerfile
       buildArgs:
-        AEA_VERSION: "1.14.0"
+        AEA_VERSION: "1.14.0.post1"
         AEA_AGENT: "{{.AEA_AGENT}}"
 
 profiles:
@@ -35,7 +35,7 @@ profiles:
         path: /build/artifacts/0/kaniko
         value:
           buildArgs:
-            AEA_VERSION: "1.14.0"
+            AEA_VERSION: "1.14.0.post1"
             AEA_AGENT: "{{.AEA_AGENT}}"
       - op: add
         path: /build/cluster
@@ -56,5 +56,5 @@ profiles:
         docker:
           dockerfile: Dockerfile
           buildArgs:
-            AEA_VERSION: "1.14.0"
+            AEA_VERSION: "1.14.0.post1"
             AEA_AGENT: "{{.AEA_AGENT}}"