Merge pull request #146 from Exabyte-io/update/SOF-7161

SOF-7161: cove peerDependency
Exabyte-io · Feb 21, 2024 · 44c5584 · 44c5584
2 parents 917c6c7 + ff84246
commit 44c5584
Show file tree

Hide file tree

Showing 6 changed files with 485 additions and 285 deletions.
diff --git a/.github/workflows/docker-build-test/action.yml b/.github/workflows/docker-build-test/action.yml
@@ -9,22 +9,33 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Pull base image
-      uses: ./actions/docker/ecr
-      id: login-ecr
+    - name: Cache Docker images.
+      uses: ScribeMD/docker-cache@0.3.6
       with:
-        ecr-repository: centos-7.9-base
-        aws-access-key-id: ${{ inputs.aws-access-key-id }}
-        aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
-        image-tag: latest
-        action: pull
+        key: docker-${{ runner.os }}-${{ hashFiles('package.json') }}
+
+    # - name: Pull base image
+    #   uses: ./actions/docker/ecr
+    #   id: login-ecr
+    #   with:
+    #     ecr-repository: centos-7.9-base
+    #     aws-access-key-id: ${{ inputs.aws-access-key-id }}
+    #     aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
+    #     image-tag: latest
+    #     action: pull
+
+    - name: Build base image
+      uses: ./actions/docker/build
+      with:
+        image-name: centos-base
+        dockerfile: ./dockerfiles/centos/Dockerfile
 
     - name: Build container
       uses: ./actions/docker/build
       with:
         image-name: wave-test
         dockerfile: ./dockerfiles/app/Dockerfile
-        cli-args: --build-arg BASE_IMAGE=${{ steps.login-ecr.outputs.registry }}/centos-7.9-base
+        cli-args: --build-arg BASE_IMAGE=centos-base
 
     - name: Run tests
       shell: bash -l {0}

diff --git a/dockerfiles/centos/Dockerfile b/dockerfiles/centos/Dockerfile
@@ -22,7 +22,7 @@ RUN yum install -y \
 
 # Install nvm with node and npm
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION 12.21.0
+ENV NODE_VERSION 14.19.3
 RUN mkdir /usr/local/nvm
 RUN curl -sL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \
     && . $NVM_DIR/nvm.sh \

diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y -q --no-install-recommends \
 
 # Install nvm with node and npm
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION 12.21.0
+ENV NODE_VERSION 14.19.3
 RUN mkdir /usr/local/nvm
 RUN curl -sL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \
     && . $NVM_DIR/nvm.sh \