Fix builder images

Signed-off-by: Wade Barnes <[email protected]>
sovrin-foundation · Feb 12, 2024 · 93136d1 · 93136d1
1 parent 256ae47
commit 93136d1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 57 deletions.
diff --git a/.github/workflows/build/Dockerfile.ubuntu-2004 b/.github/workflows/build/Dockerfile.ubuntu-2004
@@ -6,11 +6,10 @@ ARG user=indy
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y 
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y
 
-RUN apt-get update -y \
-    && echo "deb http://security.ubuntu.com/ubuntu bionic main"  >> /etc/apt/sources.list \
-    && apt-get install -y --allow-downgrades \
+RUN echo "deb http://security.ubuntu.com/ubuntu bionic main"  >> /etc/apt/sources.list && \
+    apt-get update -y && apt-get install -y --allow-downgrades \
     # common stuff
     git \
     wget \
@@ -19,7 +18,7 @@ RUN apt-get update -y \
     apt-utils \
     nano \
     software-properties-common \
-    supervisor \ 
+    supervisor \
     # Python
     python3-pip \
     python3-nacl \
@@ -29,50 +28,44 @@ RUN apt-get update -y \
     librocksdb-dev \
     libsnappy-dev \
     liblz4-dev \
-    libbz2-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# fails when executed in one command with other pip install packages
-# RUN pip install python-rocksdb
+    libbz2-dev
 
 RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main"  >> /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \ 
+    apt-get update -y && apt-get install -y \
     libssl1.0.0 \
     libssl1.1
 # Indy Node and Plenum
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 \
     && echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list \
-    && apt-get update && apt-get install -y \ 
+    && apt-get update && apt-get install -y \
     ursa
 # install fpm
-ENV FPM_VERSION=1.9.3
-RUN apt-get update \
-    && apt-add-repository ppa:brightbox/ruby-ng \
-    && apt-get install -y --no-install-recommends \
-    ruby2.6 \
-    ruby2.6-dev \
-    && gem install --no-document rake fpm:$FPM_VERSION \
-    && rm -rf /var/lib/apt/lists/*
+ENV FPM_VERSION=1.14.2
+ENV DOTENV_VERSION=2.8.1
+RUN apt-get update -y && apt-get install -y \
+    ruby \
+    ruby-dev \
+    rubygems \
+    && gem install --no-document rake dotenv:$DOTENV_VERSION fpm:$FPM_VERSION
 
 # Need to move libursa.so to parent dir
 RUN mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
 
 # Indy SDK
-# RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 || \
-# 	apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CE7709D068DB5E88 && \
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ 
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9692C00E657DDE61 \ 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9692C00E657DDE61 \
     && add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" \
     && add-apt-repository "deb https://repo.sovrin.org/deb xenial master" \
     && add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" \
     && add-apt-repository "deb https://repo.sovrin.org/sdk/deb bionic master" \
     && add-apt-repository "deb http://archive.ubuntu.com/ubuntu xenial universe main" \
-    && apt-get update -y && apt-get install -y \ 
+    && apt-get update -y && apt-get install -y \
     libindy=1.15.0~1625-bionic \
     libsodium23
 
 # pypi based packages
 RUN pip3 install -U \
+    Cython==0.29.36 \
     Pygments==2.2.0 \
     Pympler==0.8 \
     PyNaCl==1.3.0 \
@@ -124,13 +117,11 @@ RUN pip3 install -U \
     wheel==0.34.2 \
     zipp==1.2.0 \
     mock
-# virtualenv \
-# python-rocksdb==0.7
 
 COPY ./deps .
 RUN dpkg -i libsovtoken_1.0.2_amd64.deb
 
 RUN mkdir -p /etc/indy && echo "ENABLED_PLUGINS = ['sovtoken', 'sovtokenfees']" > /etc/indy/indy_config.py
 
 RUN apt-get -y autoremove
-RUN rm -rf /var/lib/apt/lists/*
+RUN rm -rf /var/lib/apt/lists/*
diff --git a/devops/docker/ci/focal/Dockerfile b/devops/docker/ci/focal/Dockerfile
@@ -6,11 +6,10 @@ ARG user=indy
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y 
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y
 
-RUN apt-get update -y \
-    && echo "deb http://security.ubuntu.com/ubuntu bionic main"  >> /etc/apt/sources.list \
-    && apt-get install -y --allow-downgrades \
+RUN echo "deb http://security.ubuntu.com/ubuntu bionic main"  >> /etc/apt/sources.list && \
+    apt-get update -y && apt-get install -y --allow-downgrades \
     # common stuff
     git \
     wget \
@@ -19,7 +18,7 @@ RUN apt-get update -y \
     apt-utils \
     nano \
     software-properties-common \
-    supervisor \ 
+    supervisor \
     # Python
     python3-pip \
     python3-nacl \
@@ -29,52 +28,46 @@ RUN apt-get update -y \
     librocksdb-dev \
     libsnappy-dev \
     liblz4-dev \
-    libbz2-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# fails when executed in one command with other pip install packages
-# RUN pip install python-rocksdb
+    libbz2-dev
 
 RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main"  >> /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \ 
+    apt-get update -y && apt-get install -y \
     libssl1.0.0 \
     libssl1.1
 # Indy Node and Plenum
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 \
     && echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list \
-    && apt-get update && apt-get install -y \ 
+    && apt-get update && apt-get install -y \
     ursa
 # install fpm
-ENV FPM_VERSION=1.9.3
-RUN apt-get update \
-    && apt-add-repository ppa:brightbox/ruby-ng \
-    && apt-get install -y --no-install-recommends \
-    ruby2.6 \
-    ruby2.6-dev \
-    && gem install --no-document rake fpm:$FPM_VERSION \
-    && rm -rf /var/lib/apt/lists/*
+ENV FPM_VERSION=1.14.2
+ENV DOTENV_VERSION=2.8.1
+RUN apt-get update -y && apt-get install -y \
+    ruby \
+    ruby-dev \
+    rubygems \
+    && gem install --no-document rake dotenv:$DOTENV_VERSION fpm:$FPM_VERSION
 
 # Need to move libursa.so to parent dir
 RUN mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
 
 # Indy SDK
-# RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 || \
-# 	apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CE7709D068DB5E88 && \
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ 
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9692C00E657DDE61 \ 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9692C00E657DDE61 \
     && add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" \
     && add-apt-repository "deb https://repo.sovrin.org/deb xenial master" \
     && add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" \
     && add-apt-repository "deb https://repo.sovrin.org/sdk/deb bionic master" \
     && add-apt-repository "deb http://archive.ubuntu.com/ubuntu xenial universe main" \
-    && apt-get update -y && apt-get install -y \ 
+    && apt-get update -y && apt-get install -y \
     libindy=1.15.0~1625-bionic \
     indy-plenum=1.13.0.dev.0 \
     indy-node=1.13.0.dev.0 \
     libsodium23
 
 # pypi based packages
-RUN pip3 install -U \ 
+RUN pip3 install -U \
+    Cython==0.29.36 \
     Pygments==2.2.0 \
     Pympler==0.8 \
     PyNaCl==1.3.0 \
@@ -126,8 +119,6 @@ RUN pip3 install -U \
     wheel==0.34.2 \
     zipp==1.2.0 \
     mock
-# virtualenv \
-# python-rocksdb==0.7
 
 COPY ./deps .
 RUN dpkg -i libsovtoken_1.0.2_amd64.deb
@@ -138,4 +129,4 @@ RUN apt-get -y autoremove
 RUN rm -rf /var/lib/apt/lists/*
 
 # TODO CMD ENTRYPOINT ...
-ENV CI_ENV_VERSION=0.21.0
+ENV CI_ENV_VERSION=0.23.0