Merge pull request #1838 from WadeBarnes/main

Fix fpm installation
hyperledger · Feb 12, 2024 · 2ab0b5e · 2ab0b5e
2 parents 4a0adf6 + 28f42c8
commit 2ab0b5e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -68,8 +68,7 @@ RUN pip3 install -U \
 
 
 # install fpm
-RUN gem install --no-document rake
-RUN gem install --no-document fpm -v 1.14.2
+RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
 
 RUN apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*
diff --git a/.github/workflows/build/Dockerfile.ubuntu-2004 b/.github/workflows/build/Dockerfile.ubuntu-2004
@@ -34,5 +34,4 @@ RUN echo "deb  https://hyperledger.jfrog.io/artifactory/indy focal dev rc stable
 RUN apt-get update -y && apt-get install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/*
 
 # install fpm
-RUN gem install --no-document rake
-RUN gem install --no-document fpm -v 1.14.2
+RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
diff --git a/.github/workflows/publishRelease.yaml b/.github/workflows/publishRelease.yaml
@@ -50,23 +50,23 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download Node deb Artifacts from Github Action Artifacts
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: releasepr.yaml
           workflow_conclusion: success
           name: indy_node-deb
           path: artifacts/indy_node-deb
       - name: Download Node python Artifacts from Github Action Artifacts
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: releasepr.yaml
           workflow_conclusion: success
           name: indy_node-python
           path: artifacts/indy_node-python
       - name: Download Node third party dependency Artifacts from Github Action Artifacts
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: releasepr.yaml

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -29,7 +29,7 @@ RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE
 RUN sudo add-apt-repository 'deb  https://hyperledger.jfrog.io/artifactory/indy focal dev' && \
     sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security main' && \
     sudo add-apt-repository 'deb https://repo.sovrin.org/deb bionic master'  && \
-    sudo add-apt-repository 'deb https://repo.sovrin.org/sdk/deb bionic master' 
+    sudo add-apt-repository 'deb https://repo.sovrin.org/sdk/deb bionic master'
 
 
 
@@ -68,5 +68,4 @@ RUN pip3 install -U \
 
 
 # install fpm
-RUN sudo gem install --no-document rake 
-RUN sudo gem install --no-document fpm -v 1.14.2
+RUN sudo gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
diff --git a/build-scripts/ubuntu-2004/Dockerfile b/build-scripts/ubuntu-2004/Dockerfile
@@ -30,7 +30,7 @@ RUN echo "deb  https://hyperledger.jfrog.io/artifactory/indy focal dev"  >> /etc
     echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list
 
 # Sovrin
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
 
 RUN apt-get update -y && apt-get install -y \
     # Python
@@ -66,8 +66,7 @@ RUN pip3 install -U \
     'pyzmq==22.3.0'
 
 # install fpm
-RUN gem install --no-document rake 
-RUN gem install --no-document fpm -v 1.14.2
+RUN gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
 
 RUN apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*