Merge pull request #1185 from PokeAPI/remove-arm

Remove support for arm6 and 7

.github/workflows/docker-build-and-push.yml

@@ -1,4 +1,4 @@
-name: Build and Push Docker image
+name: Push Docker image
 
 on:
   push:
@@ -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 }}
@@ -43,12 +41,12 @@ 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
           push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: linux/amd64,linux/arm64 #,linux/arm/v7,linux/arm/v6
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Image digest

.github/workflows/docker-k8s.yml

@@ -1,4 +1,4 @@
-name: Build Docker image and create k8s with it
+name: Test Docker and k8s
 
 on:
   pull_request:
@@ -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

README.md

@@ -23,18 +23,17 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 ## Table of Contents
 
-- [Setup   ](#setup)
+- [Setup](#setup)
 - [Database setup](#database-setup)
-- [Docker and Compose   ](#docker-and-compose)
-- [GraphQL   ](#graphql)
-- [Kubernetes   ](#kubernetes)
+- [Docker and Compose](#docker-and-compose)
+- [GraphQL](#graphql)
+- [Kubernetes](#kubernetes)
 - [Wrappers](#wrappers)
 - [Donations](#donations)
 - [Join Us On Slack!](#join-us-on-slack)
 - [Contributing](#contributing)
-- [Deprecation](#deprecation)
 
-## Setup <a id="setup"></a> &nbsp; [![pyVersion310](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/download/releases/3.10/)
+## Setup <a id="setup"></a> &nbsp; [![pyVersion310](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/download/releases/3.10/)
 
 - Download this source code into a working directory, be sure to use the flag `--recurse-submodules` to clone also our submodules.
 
@@ -237,7 +236,3 @@ To contribute to this repository:
 - We'll accept your changes after review.
 
 Simple!
-
-## Deprecation
-
-As of October 2018, the v1 API has been removed from PokéAPI. For more information, see [pokeapi.co/docs/v1.html](https://pokeapi.co/docs/v1.html).

Resources/docker/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11.11-alpine3.21 AS builder
+FROM python:3.12.8-alpine3.21 AS builder
 
 ENV PYTHONUNBUFFERED=1
 
@@ -11,15 +11,15 @@ RUN apk add --no-cache --virtual .build-deps gcc g++ musl-dev \
     postgresql-dev binutils rust cargo && \
     python3 -m pip install -r requirements.txt --no-cache-dir
 
-FROM python:3.11.11-alpine3.21
+FROM python:3.12.8-alpine3.21
 
 ENV PYTHONUNBUFFERED=1
 ENV DJANGO_SETTINGS_MODULE='config.docker-compose'
 
 RUN mkdir /code
 WORKDIR /code
 
-COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
+COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
 COPY --from=builder /usr/local/bin /usr/local/bin
 
 ADD . /code/

Resources/docker/app/README.md

@@ -17,7 +17,7 @@
 - [`master`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile)
 - [`staging`](https://github.com/PokeAPI/pokeapi/blob/staging/Resources/docker/app/Dockerfile)
 
-> `pokeapi` uses `python:3.10-alpine` as base image.
+> `pokeapi` uses `python:3.12.8-alpine3.21` as base image.
 
 ## What is PokeAPI?