fix: docker container build (#2676)

dbeaver · May 30, 2024 · 6077a52 · 6077a52
1 parent 7b72831
commit 6077a52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/.github/workflows/backend-build.yml b/.github/workflows/backend-build.yml
@@ -45,14 +45,6 @@ jobs:
         shell: bash
         working-directory: ./deploy
 
-      # - name: Cache Maven packages
-      #   uses: actions/cache@v4
-      #   with:
-      #     path: ~/.m2
-      #     key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-maven-
-
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
@@ -43,6 +43,7 @@ jobs:
 
       - name: Run custom Docker build script
         working-directory: ./deploy
+        shell: bash
         run: |
           chmod +x make-docker-container.sh
           ./make-docker-container.sh

diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml
@@ -30,32 +30,22 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: restore yarn cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
+          cache-dependency-path: webapp/yarn.lock
 
       - name: restore node_modules
         uses: actions/cache@v4
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('webapp/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-node_modules-
 
       - name: restore typescript cache
         uses: actions/cache@v4
         with:
           path: "**/packages/*/dist"
-          key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-dist-${{ hashFiles('webapp/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-dist-
 
@@ -65,12 +55,6 @@ jobs:
           dir: webapp
           cmd: install
 
-      - name: yarn lerna bootstrap
-        uses: borales/actions-yarn@v5
-        with:
-          dir: webapp
-          cmd: lerna bootstrap
-
       - name: build
         uses: borales/actions-yarn@v5
         with: