Skip to content

Commit

Permalink
use arm runner
Browse files Browse the repository at this point in the history
  • Loading branch information
takaishi committed Feb 10, 2025
1 parent 7288b5d commit d064ad5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
runs-on:
- "ubuntu-latest"
- "ubuntu-24.04-arm"
runs-on: ${{ matrix.runs-on }}
timeout-minutes: 10
if: github.event.pusher.name != 'dreamkast-cloudnativedays'
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
cache-to: type=gha,mode=max

merge-images:
runs-on: "ubuntu-latest"
runs-on: "ubuntu-24.04-arm"
timeout-minutes: 10
needs: ["build"]
steps:
Expand All @@ -89,7 +89,7 @@ jobs:
image_tag_sha="${{ steps.login-ecr.outputs.registry }}/dreamkast-ecs:${{ github.sha }}"
docker buildx imagetools create \
--tag ${image_tag_sha} \
${image_tag_sha}-amd64
${image_tag_sha}-arm64
# - name: Run Trivy vulnerability scanner
# uses: aquasecurity/trivy-action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: "ubuntu-24.04-arm"
steps:
- uses: actions/checkout@v4

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ ENV RAILS_ENV=${RAILS_ENV}, RAILS_LOG_TO_STDOUT=ON, RAILS_SERVE_STATIC_FILES=ena
WORKDIR /app
COPY --link --from=node /app/node_modules /app/node_modules
COPY --link --from=fetch-lib /usr/local/bundle /usr/local/bundle
RUN apt-get update && apt-get -y install wget libmariadb3 libvips42 \
&& wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& apt install -y ./google-chrome-stable_current_amd64.deb \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get -y install wget libmariadb3 libvips42 chromium && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
ENV CHROME_BIN=/usr/bin/chromium
COPY --link . .
COPY --link --from=asset-compile /app/public /app/public
EXPOSE 3000
Expand Down

0 comments on commit d064ad5

Please sign in to comment.