Thumbor updated to 7.4

thumbor-aws updated to 0.5
beeyev · Dec 20, 2022 · e89f736 · e89f736
1 parent 0c7065c
commit e89f736
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,7 +6,7 @@
 version: 2
 updates:
   - package-ecosystem: "docker"
-    directory: "/docker/thumbor-7.3/"
+    directory: "/docker/thumbor-7.4/"
     schedule:
       interval: "weekly"
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,8 +5,6 @@ on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
   schedule:
     - cron: "0 0 * * 6"
@@ -24,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         baseDist: [ 'slim-alpine', 'alpine' ]
-        versionMinor: [ '7.3' ]
+        versionMinor: [ '7.4' ]
         versionMajor: [ '7' ]
 
     steps:
@@ -70,8 +68,10 @@ jobs:
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_INFO=${{ env.BUILD_INFO }}
           tags: |
+            beeyev/thumbor-s3:${{ matrix.baseDist }}
             beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
             beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
+            ghcr.io/beeyev/thumbor-s3:${{ matrix.baseDist }}
             ghcr.io/beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
             ghcr.io/beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
           pull: true

diff --git a/README.md b/README.md
@@ -22,10 +22,12 @@ Thumbor S3 Docker is available in two variants of docker images, lightweight (sl
 > Before choosing the full-featured image version, make sure that you really need these extra functionality, since the resulting docker container is two times bigger than `slim-alpine`
 
 ### Currently maintained docker images:  
+`thumbor-s3:alpine`  
+`thumbor-s3:slim-alpine`  
 `thumbor-s3:7-alpine`  
 `thumbor-s3:7-slim-alpine`  
-`thumbor-s3:7.3-alpine`  
-`thumbor-s3:7.3-slim-alpine`
+`thumbor-s3:7.4-alpine`  
+`thumbor-s3:7.4-slim-alpine`
 
 [Docker Hub](https://hub.docker.com/r/beeyev/thumbor-s3) | [Github packages](https://github.com/beeyev/thumbor-s3-docker/pkgs/container/thumbor-s3)  
 

diff --git a/docker/thumbor-7.3/Dockerfile-alpine → docker/thumbor-7.4/Dockerfile-alpine b/docker/thumbor-7.3/Dockerfile-alpine → docker/thumbor-7.4/Dockerfile-alpine
@@ -1,4 +1,4 @@
-# docker build -t thumbor-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.3/Dockerfile-alpine . && docker run --rm -it thumbor-alpine
+# docker build -t thumbor-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.4/Dockerfile-alpine . && docker run --rm -it thumbor-alpine
 # Full-featured Thumbor docker image
 FROM python:3.10-alpine
 
@@ -39,7 +39,7 @@ RUN set -eux \
         # Jinja2 and envtpl are required to work with environtment variables
         Jinja2==3.0.* envtpl==0.6.* \
         # pycurl is required for thumbor
-        pycurl==7.* thumbor==7.3.* thumbor-aws==0.4.* tc_prometheus==2.* \
+        pycurl==7.* thumbor==7.4.* thumbor-aws==0.5.* tc_prometheus==2.* \
     && thumbor --version && envtpl --help \
     #
     ## Optional extensions

diff --git a/docker/thumbor-7.3/Dockerfile-slim-alpine → docker/thumbor-7.4/Dockerfile-slim-alpine b/docker/thumbor-7.3/Dockerfile-slim-alpine → docker/thumbor-7.4/Dockerfile-slim-alpine
@@ -1,6 +1,6 @@
-# docker build -t thumbor-slim-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.3/Dockerfile-slim-alpine . && docker run --rm -it thumbor-slim-alpine
+# docker build -t thumbor-slim-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.4/Dockerfile-slim-alpine . && docker run --rm -it thumbor-slim-alpine
 # Slim Thumbor docker image
-FROM python:3.10-alpine
+FROM python:3.11-alpine
 
 LABEL org.opencontainers.image.source=https://github.com/beeyev/thumbor-s3-docker
 
@@ -39,7 +39,7 @@ RUN set -eux \
         # Jinja2 and envtpl are required to work with environtment variables
         Jinja2==3.0.* envtpl==0.6.* \
         # pycurl is required for thumbor
-        pycurl==7.* thumbor==7.3.* thumbor-aws==0.4.* tc_prometheus==2.* \
+        pycurl==7.* thumbor==7.4.* thumbor-aws==0.5.* tc_prometheus==2.* \
     && thumbor --version && envtpl --help \
     ##
     ## Optional extensions

diff --git a/examples/read-from-S3-cache-to-S3/docker-compose.yml b/examples/read-from-S3-cache-to-S3/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.4"
 
 services:
   thumbor:
-    image: beeyev/thumbor-s3:7.3-slim-alpine
+    image: beeyev/thumbor-s3:7.4-slim-alpine
     restart: unless-stopped
     tty: true
     ports: