Fix GHA buildx file path (#987)

* Fix GHA buildx file path * Try defaultContext handlebars * Update devcore build step --------- Co-authored-by: Laura Mosher <lauramosher@users.noreply.github.com>
Terrastories · Jan 9, 2024 · c59ca7a · c59ca7a
1 parent 0ff5f5d
commit c59ca7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/on-merge-master.yml b/.github/workflows/on-merge-master.yml
@@ -23,8 +23,8 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
-        context: .
-        file: "{{defaultContext}}/rails/Dockerfile"
+        context: "{{defaultContext}}"
+        file: ./rails/Dockerfile
         target: devcore
         platforms: linux/amd64,linux/arm64,linux/arm/v7
         push: true

diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml
@@ -21,8 +21,8 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
-        context: .
-        file: "{{defaultContext}}/rails/Dockerfile"
+        context: "{{defaultContext}}"
+        file: ./rails/Dockerfile
         platforms: linux/amd64,linux/arm64,linux/arm/v7
         push: true
         tags: |

diff --git a/rails/Dockerfile b/rails/Dockerfile
@@ -28,7 +28,6 @@ RUN apk --no-cache add --update \
     imagemagick \
     ffmpeg \
     poppler && \
-    gem update --system --no-document && \
     gem install bundler --no-document --force -v '~> 2.4.7'
 
 WORKDIR /tmp