Skip to content

Commit

Permalink
feat: remove support for arm67/better names/update gh actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Naramsim committed Jan 7, 2025
1 parent 9b828c1 commit b488c62
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/docker-build-and-push.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Push Docker image
name: Push Docker image

on:
push:
Expand All @@ -20,17 +20,15 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
pokeapi/pokeapi
images: pokeapi/pokeapi
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME_NARAMSIM }}
password: ${{ secrets.DOCKERHUB_TOKEN_NARAMSIM }}
Expand All @@ -43,7 +41,7 @@ jobs:
echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
- name: Build and push
id: docker_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: ./Resources/docker/app/Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-k8s.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker image and create k8s with it
name: Test Docker and k8s

on:
pull_request:
Expand All @@ -23,12 +23,12 @@ jobs:
uses: docker/setup-buildx-action@v3
- name: Build
id: docker_build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: ./Resources/docker/app/Dockerfile
push: false
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
platforms: linux/amd64,linux/arm64 #,linux/arm/v7,linux/arm/v6
tags: pokeapi/pokeapi:local
labels: ${{ steps.meta.outputs.labels }}
- name: Image digest
Expand Down

0 comments on commit b488c62

Please sign in to comment.