From c59ca7a6ed05bdb5f58ff2c0d596481c12650d0c Mon Sep 17 00:00:00 2001 From: Laura Mosher <2660801+lauramosher@users.noreply.github.com> Date: Tue, 9 Jan 2024 14:08:14 -0500 Subject: [PATCH] Fix GHA buildx file path (#987) * Fix GHA buildx file path * Try defaultContext handlebars * Update devcore build step --------- Co-authored-by: Laura Mosher --- .github/workflows/on-merge-master.yml | 4 ++-- .github/workflows/on-release.yml | 4 ++-- rails/Dockerfile | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on-merge-master.yml b/.github/workflows/on-merge-master.yml index ec5896269..4d507ef79 100644 --- 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 index 0e59e94b7..730410a86 100644 --- 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 index 7dee52cdd..64481978f 100644 --- 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