Update 0.8.3 acapy image and python versions

charts/traction/templates/acapy/deployment.yaml

@@ -60,7 +60,7 @@ spec:
            --outbound-transport http \
            --admin '0.0.0.0' {{ .Values.acapy.service.adminPort }} \
            --endpoint https://{{ include "acapy.host" . }} \
-           --arg-file '/home/indy/argfile.yml' \
+           --arg-file '/home/aries/argfile.yml' \
            --plugin 'aries_cloudagent.messaging.jsonld' \ 
            {{- if .Values.acapy.plugins.tractionInnkeeper }}
            --plugin traction_plugins.traction_innkeeper.v1_0 \
@@ -151,11 +151,11 @@ spec:
             periodSeconds: 10 
           volumeMounts:
           - name: config
-            mountPath: "/home/indy/argfile.yml"
+            mountPath: "/home/aries/argfile.yml"
             subPath: "argfile.yml"
             readOnly: true
           - name: config
-            mountPath: "/home/indy/plugin-config.yml"
+            mountPath: "/home/aries/plugin-config.yml"
             subPath: "plugin-config.yml"
             readOnly: true
           resources:

plugins/basicmessage_storage/docker/Dockerfile

@@ -1,25 +1,31 @@
-FROM bcgovimages/von-image:py36-1.16-1 AS base
-# python 3.6.13
+FROM python:3.9-slim AS base
+WORKDIR /usr/src/app
 
-# Install and Configure Poetry
+# Install and configure poetry
 USER root
-ENV POETRY_VERSION=1.1.11
+
+ENV POETRY_VERSION=1.4.2
 ENV POETRY_HOME=/opt/poetry
+RUN apt-get update && apt-get install -y curl && apt-get clean
 RUN curl -sSL https://install.python-poetry.org | python -
 
 ENV PATH="/opt/poetry/bin:$PATH"
 RUN poetry config virtualenvs.in-project true
 
 # Setup project
 RUN mkdir basicmessage_storage && touch basicmessage_storage/__init__.py
-COPY --chown=indy:indy pyproject.toml poetry.lock README.md ./
-RUN poetry install --no-dev
+COPY pyproject.toml poetry.lock README.md ./
+ARG install_flags=--no-dev
+RUN poetry install ${install_flags}
+USER $user
 
-FROM bcgovimages/von-image:py36-1.16-1
-COPY --from=base --chown=indy:indy /home/indy/.venv /home/indy/.venv
-ENV PATH="/home/indy/.venv/bin:$PATH"
+FROM python:3.9-bullseye
+WORKDIR /usr/src/app
+COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
+ENV PATH="/usr/src/app/.venv/bin:$PATH"
 
+COPY basicmessage_storage/ basicmessage_storage/
 COPY docker/default.yml ./
-COPY basicmessage_storage basicmessage_storage
+
 ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]
 CMD ["start", "--arg-file", "default.yml"]

plugins/basicmessage_storage/pyproject.toml

@@ -5,13 +5,13 @@ description = ""
 authors = ["Jason Sherman <[email protected]>"]
 
 [tool.poetry.dependencies]
-python = ">=3.6.13,<4.0"
-aries-cloudagent = { version = "1.0.0rc1" }
+python = "^3.9"
+aries-cloudagent = { version = "0.8.2" }
 
 [tool.poetry.dev-dependencies]
-black = "^22.6.0"
 flake8 = "^5.0.4"
+black = "^22.6.0"
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
+requires = ["setuptools", "poetry-core>=1.2"]
 build-backend = "poetry.core.masonry.api"

plugins/connection_update/docker/Dockerfile

@@ -1,25 +1,31 @@
-FROM bcgovimages/von-image:py36-1.16-1 AS base
-# python 3.6.13
+FROM python:3.9-slim AS base
+WORKDIR /usr/src/app
 
-# Install and Configure Poetry
+# Install and configure poetry
 USER root
-ENV POETRY_VERSION=1.1.15
+
+ENV POETRY_VERSION=1.4.2
 ENV POETRY_HOME=/opt/poetry
+RUN apt-get update && apt-get install -y curl && apt-get clean
 RUN curl -sSL https://install.python-poetry.org | python -
 
 ENV PATH="/opt/poetry/bin:$PATH"
 RUN poetry config virtualenvs.in-project true
 
 # Setup project
 RUN mkdir connection_update && touch connection_update/__init__.py
-COPY --chown=indy:indy pyproject.toml README.md ./
-RUN poetry install --no-dev
+COPY pyproject.toml poetry.lock README.md ./
+ARG install_flags=--no-dev
+RUN poetry install ${install_flags}
+USER $user
 
-FROM bcgovimages/von-image:py36-1.16-1
-COPY --from=base --chown=indy:indy /home/indy/.venv /home/indy/.venv
-ENV PATH="/home/indy/.venv/bin:$PATH"
+FROM python:3.9-bullseye
+WORKDIR /usr/src/app
+COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
+ENV PATH="/usr/src/app/.venv/bin:$PATH"
 
+COPY connection_update/ connection_update/
 COPY docker/default.yml ./
-COPY connection_update connection_update
+
 ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]
 CMD ["start", "--arg-file", "default.yml"]

plugins/connection_update/pyproject.toml

@@ -8,12 +8,12 @@ readme = "README.md"
 packages = [{include = "connection_update"}]
 
 [tool.poetry.dependencies]
-python = ">=3.6.13,<4.0"
-aries-cloudagent = { version = "1.0.0rc1" }
+python = "^3.9"
+aries-cloudagent = { version = "0.8.2" }
 
 [tool.poetry.dev-dependencies]
-black = "^22.6.0"
 flake8 = "^5.0.4"
+black = "^22.6.0"
 
 [build-system]
 requires = ["setuptools", "poetry-core>=1.2"]

plugins/demo/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - 3000:3000
       - 3002:3002
     volumes:
-      - ./configs:/home/indy/configs:ro,z
+      - ./configs:/home/aries/configs:ro,z
     extra_hosts:
       - host.docker.internal:host-gateway
     entrypoint: >

plugins/docker/Dockerfile

@@ -1,41 +1,41 @@
-FROM bcgovimages/von-image:py36-1.16-1 AS base
-# python 3.6.13
+FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.8.3-pre as base
 
 # Install and Configure Poetry
 USER root
-ENV POETRY_VERSION=1.1.15
+ENV POETRY_VERSION=1.4.2
 ENV POETRY_HOME=/opt/poetry
+RUN apt-get update && apt-get install -y curl && apt-get clean
 RUN curl -sSL https://install.python-poetry.org | python -
 
 ENV PATH="/opt/poetry/bin:$PATH"
 RUN poetry config virtualenvs.in-project true
 
 # Setup project
 RUN mkdir traction_plugins && touch traction_plugins/__init__.py
-COPY --chown=indy:indy pyproject.toml README.md ./
+COPY --chown=aries:aries pyproject.toml README.md ./
 
 # copy over our local plugins code so we can build/install them
 # these should come from github or some version, published location
-COPY --chown=indy:indy basicmessage_storage ./basicmessage_storage
-COPY --chown=indy:indy connection_update ./connection_update
-COPY --chown=indy:indy multitenant_provider ./multitenant_provider
-COPY --chown=indy:indy traction_innkeeper ./traction_innkeeper
+COPY --chown=aries:aries basicmessage_storage ./basicmessage_storage
+COPY --chown=aries:aries connection_update ./connection_update
+COPY --chown=aries:aries multitenant_provider ./multitenant_provider
+COPY --chown=aries:aries traction_innkeeper ./traction_innkeeper
 
 RUN poetry install --no-dev
 
 # Make site packages location more accessible (for use with volumes)
 RUN ln -s $(poetry env info -p)/lib/python3.6/site-packages site-packages
 
 
-FROM bcgovimages/aries-cloudagent:py36-1.16-1_0.8.1
-COPY --from=base --chown=indy:indy /home/indy/.venv /home/indy/.venv
-ENV PATH="/home/indy/.venv/bin:$PATH"
+FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.8.3-pre
+COPY --from=base --chown=aries:aries /home/aries/.venv /home/aries/.venv
+ENV PATH="/home/aries/.venv/bin:$PATH"
 
-COPY --chown=indy:indy docker/default.yml ./
-COPY --chown=indy:indy basicmessage_storage/basicmessage_storage traction_plugins/basicmessage_storage
-COPY --chown=indy:indy connection_update/connection_update traction_plugins/connection_update
-COPY --chown=indy:indy multitenant_provider/multitenant_provider traction_plugins/multitenant_provider
-COPY --chown=indy:indy traction_innkeeper/traction_innkeeper traction_plugins/traction_innkeeper
+COPY --chown=aries:aries docker/default.yml ./
+COPY --chown=aries:aries basicmessage_storage/basicmessage_storage traction_plugins/basicmessage_storage
+COPY --chown=aries:aries connection_update/connection_update traction_plugins/connection_update
+COPY --chown=aries:aries multitenant_provider/multitenant_provider traction_plugins/multitenant_provider
+COPY --chown=aries:aries traction_innkeeper/traction_innkeeper traction_plugins/traction_innkeeper
 
 ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]
 CMD ["start", "--arg-file", "default.yml"]

plugins/multitenant_provider/docker/Dockerfile

@@ -1,25 +1,31 @@
-FROM bcgovimages/von-image:py36-1.16-1 AS base
-# python 3.6.13
+FROM python:3.9-slim AS base
+WORKDIR /usr/src/app
 
-# Install and Configure Poetry
+# Install and configure poetry
 USER root
-ENV POETRY_VERSION=1.1.11
+
+ENV POETRY_VERSION=1.4.2
 ENV POETRY_HOME=/opt/poetry
+RUN apt-get update && apt-get install -y curl && apt-get clean
 RUN curl -sSL https://install.python-poetry.org | python -
 
 ENV PATH="/opt/poetry/bin:$PATH"
 RUN poetry config virtualenvs.in-project true
 
 # Setup project
 RUN mkdir multitenant_provider && touch multitenant_provider/__init__.py
-COPY --chown=indy:indy pyproject.toml poetry.lock README.md ./
-RUN poetry install --no-dev
+COPY pyproject.toml poetry.lock README.md ./
+ARG install_flags=--no-dev
+RUN poetry install ${install_flags}
+USER $user
 
-FROM bcgovimages/von-image:py36-1.16-1
-COPY --from=base --chown=indy:indy /home/indy/.venv /home/indy/.venv
-ENV PATH="/home/indy/.venv/bin:$PATH"
+FROM python:3.9-bullseye
+WORKDIR /usr/src/app
+COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
+ENV PATH="/usr/src/app/.venv/bin:$PATH"
 
+COPY multitenant_provider/ multitenant_provider/
 COPY docker/default.yml ./
-COPY multitenant_provider multitenant_provider
+
 ENTRYPOINT ["/bin/bash", "-c", "aca-py \"$@\"", "--"]
 CMD ["start", "--arg-file", "default.yml"]