Merge pull request #2664 from bitshares/update-ci

Update CI configurations and Dockerfile

.github/workflows/build-and-test.mac.yml

@@ -17,7 +17,7 @@ jobs:
         brew install ccache
         brew install parallel
         brew install bitshares/boost/boost@1.69
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Configure
@@ -31,7 +31,7 @@ jobs:
               -D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 \
               ..
     - name: Load Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ccache
         key: ccache-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

.github/workflows/build-and-test.ubuntu-debug.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     services:
       elasticsearch:
-        image: docker://elasticsearch:7.17.5
+        image: docker://elasticsearch:7.17.7
         options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
     steps:
     - name: Install dependencies
@@ -43,7 +43,7 @@ jobs:
         df -h
         sudo du -hs /mnt/*
         sudo ls -alr /mnt/
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Configure
@@ -77,7 +77,7 @@ jobs:
               ..
         popd
     - name: Load Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ccache
         key: ccache-debug-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

.github/workflows/build-and-test.ubuntu-release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     services:
       elasticsearch:
-        image: docker://elasticsearch:7.17.5
+        image: docker://elasticsearch:7.17.7
         options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
     steps:
     - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
         sudo apt-get auto-remove -y
         sudo apt-get clean -y
         df -h
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: Configure
@@ -57,7 +57,7 @@ jobs:
               ..
         popd
     - name: Load Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ccache
         key: ccache-release-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

.github/workflows/build-and-test.win.yml

@@ -6,8 +6,8 @@ env:
   # The following are for windows cross-build only:
   BOOST_VERSION: 1_69_0
   BOOST_DOTTED_VERSION: 1.69.0
-  CURL_VERSION: 7.67.0
-  OPENSSL_VERSION: 1.1.1d
+  CURL_VERSION: 7.86.0
+  OPENSSL_VERSION: 1.1.1q
   ZLIB_VERSION: 1.2.13
 jobs:
   prepare-mingw64-libs:
@@ -19,7 +19,7 @@ jobs:
         echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
     - name: Load Cache
       id: cache-libs
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: libs
         key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
@@ -113,13 +113,13 @@ jobs:
         sudo apt-get auto-remove -y
         sudo apt-get clean -y
         df -h
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
     - run: |
         echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
     - name: Load external libraries
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: libs
         key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
@@ -143,7 +143,7 @@ jobs:
               -D GRAPHENE_DISABLE_UNITY_BUILD=ON \
               ..
     - name: Load Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ccache
         key: ccache-mingw64-${{ env.OS_VERSION }}-${{ github.ref }}-${{ github.sha }}

.github/workflows/build-docker.yml

@@ -4,15 +4,13 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-    - name: Inject slug/short environment variables
-      uses: rlespinasse/github-slug-action@v3.x
     - name: Decide whether to push to DockerHub, and set tag
       if: |
         github.event_name == 'push' &&
         ( startsWith( github.ref, 'refs/tags/' ) ||
-          contains( fromJSON('["master","develop","testnet","hardfork"]'), env.GITHUB_REF_NAME ) )
+          contains( fromJSON('["master","develop","testnet","hardfork"]'), github.ref_name ) )
       run: |
-        if [[ "${GITHUB_REF_NAME}" == "master" ]] ; then
+        if [ "${GITHUB_REF_NAME}" == "master" ] ; then
           DOCKER_PUSH_TAG=latest
         else
           DOCKER_PUSH_TAG=${GITHUB_REF_NAME}
@@ -23,23 +21,23 @@ jobs:
       if: env.DOCKER_PUSH_TAG != ''
       run: echo "${DOCKER_PUSH_TAG}"
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     - name: Build only
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         context: .
         load: true
     - name: Login to DockerHub
       if: env.DOCKER_PUSH_TAG != ''
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Push to DockerHub
       if: env.DOCKER_PUSH_TAG != ''
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         context: .
         push: true

.github/workflows/sonar-scan.yml

@@ -8,11 +8,11 @@ jobs:
     name: Scan with SonarScanner
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ ubuntu-20.04 ]
     runs-on: ${{ matrix.os }}
     services:
       elasticsearch:
-        image: docker://elasticsearch:7.17.5
+        image: docker://elasticsearch:7.17.7
         options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
     steps:
     - name: Download and install latest SonarScanner CLI tool
@@ -61,7 +61,7 @@ jobs:
         df -h
         sudo du -hs /mnt/*
         sudo ls -alr /mnt/
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
         submodules: recursive
@@ -103,7 +103,7 @@ jobs:
     - run: |
         echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
     - name: Load Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
           ccache

Dockerfile

@@ -1,9 +1,11 @@
-FROM phusion/baseimage:focal-1.0.0
+FROM phusion/baseimage:focal-1.2.0
 MAINTAINER The bitshares decentralized organisation
 
 ENV LANG=en_US.UTF-8
 RUN \
-    apt-get update -y && \
+    apt-get update && \
+    apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
+    apt-get update && \
     apt-get install -y \
       g++ \
       autoconf \
@@ -53,7 +55,7 @@ RUN \
     install -s programs/witness_node/witness_node programs/genesis_util/get_dev_key programs/cli_wallet/cli_wallet /usr/local/bin && \
     #
     # Obtain version
-    mkdir /etc/bitshares && \
+    mkdir -p /etc/bitshares && \
     git rev-parse --short HEAD > /etc/bitshares/version && \
     cd / && \
     rm -rf /bitshares-core