Skip to content

Commit

Permalink
Improve docker image build + arm
Browse files Browse the repository at this point in the history
  • Loading branch information
jackra1n committed Aug 22, 2024
1 parent 004971f commit 1e327e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,24 @@ jobs:
uses: actions/checkout@v4

- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
id: push
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
uses: docker/build-push-action@v6
with:
platform: linux/amd64,linux/arm64
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Generate artifact attestation
uses: actions/attest-build-provenance@v1
with:
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
subject-digest: ${{ steps.push.outputs.digest }}
push-to-registry: true
3 changes: 2 additions & 1 deletion extensions/url_cleaner.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ async def on_message(self, message: discord.Message):

embed = discord.Embed(title="Please avoid sending links containing tracking parameters.")
tracker_list = ", ".join([f"`{tracker}`" for tracker in removed_trackers])
response = f"{tracker_list} {'are' if len(removed_trackers) > 1 else 'is'} used for tracking."
verb = 'are' if len(removed_trackers) > 1 else 'is'
response = f"{tracker_list} {verb} used for tracking."
response += f"\n Here's the link without trackers:\n{'\n'.join(cleaned_urls)}"
embed.description = response
await message.reply(embed=embed)
Expand Down

0 comments on commit 1e327e9

Please sign in to comment.