bump to thumbor v7.2.* & tc_prometheus v2.*

beeyev · Oct 31, 2022 · 544280e · 544280e
1 parent 6e1e12d
commit 544280e
Show file tree

Hide file tree

Showing 6 changed files with 15 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.1/"
+    directory: "/docker/thumbor-7.2/"
     schedule:
       interval: "weekly"
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,8 @@ jobs:
       fail-fast: false
       matrix:
         baseDist: [ 'slim-alpine', 'alpine' ]
-        version: [ '7.1' ]
+        versionMinor: [ '7.2' ]
+        versionMajor: [ '7' ]
 
     steps:
       -
@@ -64,13 +65,15 @@ jobs:
           #cache-from: type=gha, scope=${{ github.workflow }}-${{ matrix.version }}-${{ matrix.baseDist }}
           #cache-to: type=gha, scope=${{ github.workflow }}-${{ matrix.version }}-${{ matrix.baseDist }}, mode=max
           context: .
-          file: ./docker/thumbor-${{ matrix.version }}/Dockerfile-${{ matrix.baseDist }}
+          file: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
           build-args: |
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_INFO=${{ env.BUILD_INFO }}
           tags: |
-            beeyev/thumbor-s3:${{ matrix.version }}-${{ matrix.baseDist }}
-            ghcr.io/beeyev/thumbor-s3:${{ matrix.version }}-${{ matrix.baseDist }}
+            beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
+            beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
+            ghcr.io/beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
+            ghcr.io/beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
           pull: true
           push: true
 

diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ 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:7.1-alpine`  
-`thumbor-s3:7.1-slim-alpine`
+`thumbor-s3:7.2-alpine`  
+`thumbor-s3:7.2-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.1/Dockerfile-alpine → docker/thumbor-7.2/Dockerfile-alpine b/docker/thumbor-7.1/Dockerfile-alpine → docker/thumbor-7.2/Dockerfile-alpine
@@ -1,4 +1,4 @@
-# docker build -t thumbor-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.1/Dockerfile-alpine . && docker run --rm -it Dockerfile-alpine
+# docker build -t thumbor-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.2/Dockerfile-alpine . && docker run --rm -it thumbor-alpine
 # Full-featured Thumbor docker image
 FROM python:3.10-alpine
 
@@ -36,7 +36,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.45.* thumbor==7.1.* thumbor-aws==0.4.* tc_prometheus==0.1.* \
+        pycurl==7.45.* thumbor==7.2.* thumbor-aws==0.4.* tc_prometheus==2.* \
     && thumbor --version && envtpl --help
 
 ##

diff --git a/docker/thumbor-7.1/Dockerfile-slim-alpine → docker/thumbor-7.2/Dockerfile-slim-alpine b/docker/thumbor-7.1/Dockerfile-slim-alpine → docker/thumbor-7.2/Dockerfile-slim-alpine
@@ -1,4 +1,4 @@
-# docker build -t thumbor-slim-alpine --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/thumbor-7.1/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.2/Dockerfile-slim-alpine . && docker run --rm -it thumbor-slim-alpine
 # Slim Thumbor docker image
 FROM python:3.10-alpine
 
@@ -36,7 +36,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.45.* thumbor==7.1.* thumbor-aws==0.4.* tc_prometheus==0.1.* \
+        pycurl==7.45.* thumbor==7.2.* thumbor-aws==0.4.* tc_prometheus==2.* \
     && thumbor --version && envtpl --help
 
 ##

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.1-slim-alpine
+    image: beeyev/thumbor-s3:7.2-slim-alpine
     restart: unless-stopped
     tty: true
     ports: