Merge pull request #29 from beeyev/7.7

Update 7.7
beeyev · Nov 12, 2023 · b54b1ff · b54b1ff
2 parents c538841 + ba0491e
commit b54b1ff
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/merge-build-production-docker-images.yml b/.github/workflows/merge-build-production-docker-images.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         baseDist: [ 'slim-alpine', 'alpine' ]
-        versionMinor: [ '7.6' ]
+        versionMinor: [ '7.7' ]
         versionMajor: [ '7' ]
     name: Build Production Docker Images / ${{ matrix.versionMinor }}-${{ matrix.baseDist }}
     with:

diff --git a/.github/workflows/pr-build-test-docker-image.yml b/.github/workflows/pr-build-test-docker-image.yml
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         baseDist: [ 'slim-alpine', 'alpine' ]
-        versionMinor: [ '7.6' ]
+        versionMinor: [ '7.7' ]
     name: Build Test Docker Images / ${{ matrix.baseDist }}-test
     with:
       DOCKER_REGISTRY_IMAGE: ghcr.io/beeyev/thumbor-s3:${{ matrix.baseDist }}-test

diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ Thumbor S3 Docker is available in two variants of docker images, a lightweight (
 `thumbor-s3:slim-alpine`  
 `thumbor-s3:7-alpine`  
 `thumbor-s3:7-slim-alpine`  
-`thumbor-s3:7.6-alpine`  
-`thumbor-s3:7.6-slim-alpine`
+`thumbor-s3:7.7-alpine`  
+`thumbor-s3:7.7-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/compose.yaml b/compose.yaml
@@ -9,7 +9,7 @@ services:
   thumbor:
     container_name: 'thumbor'
     build:
-      dockerfile: ./docker/thumbor-7.6/Dockerfile-slim-alpine
+      dockerfile: ./docker/thumbor-7.7/Dockerfile-slim-alpine
       context: ./
       args:
         - 'BUILDKIT_INLINE_CACHE=1'

diff --git a/docker/config/thumbor/thumbor.conf.tpl b/docker/config/thumbor/thumbor.conf.tpl
@@ -320,8 +320,8 @@ HTTP_LOADER_FORWARD_ALL_HEADERS = {{ HTTP_LOADER_FORWARD_ALL_HEADERS | default(F
 HTTP_LOADER_FORWARD_HEADERS_WHITELIST = {{ HTTP_LOADER_FORWARD_HEADERS_WHITELIST | default([]) }}
 
 ## Default user agent for thumbor http loader requests
-## Defaults to: 'Thumbor/7.6'
-HTTP_LOADER_DEFAULT_USER_AGENT = '{{ HTTP_LOADER_DEFAULT_USER_AGENT | default('Thumbor/7.6') }}'
+## Defaults to: 'Thumbor/7.7'
+HTTP_LOADER_DEFAULT_USER_AGENT = '{{ HTTP_LOADER_DEFAULT_USER_AGENT | default('Thumbor/7.7') }}'
 
 ## The proxy host needed to load images through
 ## Defaults to: None

diff --git a/docker/thumbor-7.6/Dockerfile-alpine → docker/thumbor-7.7/Dockerfile-alpine b/docker/thumbor-7.6/Dockerfile-alpine → docker/thumbor-7.7/Dockerfile-alpine
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 # Alexander Tebiev - https://github.com/beeyev/thumbor-s3-docker
 # Full-featured Thumbor docker image
-# docker buildx build --cache-to=type=inline --build-arg=BUILD_DATE=0000 --build-arg=BUILD_FINGERPRINT=0000 --pull --tag thumbor-alpine --file ./docker/thumbor-7.6/Dockerfile-alpine ./ && docker run -it --rm thumbor-alpine
+# docker buildx build --cache-to=type=inline --build-arg=BUILD_DATE=0000 --build-arg=BUILD_FINGERPRINT=0000 --pull --tag thumbor-alpine --file ./docker/thumbor-7.7/Dockerfile-alpine ./ && docker run -it --rm thumbor-alpine
 FROM python:3.11-alpine
 
 LABEL org.opencontainers.image.source=https://github.com/beeyev/thumbor-s3-docker
@@ -42,7 +42,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.6.* thumbor-aws==0.6.* tc_prometheus==2.* \
+        pycurl==7.* thumbor==7.7.* thumbor-aws==0.6.* tc_prometheus==2.* \
         "numpy==1.*,<1.24.0" \
     && thumbor --version && envtpl --help \
     #

diff --git a/docker/thumbor-7.6/Dockerfile-slim-alpine → docker/thumbor-7.7/Dockerfile-slim-alpine b/docker/thumbor-7.6/Dockerfile-slim-alpine → docker/thumbor-7.7/Dockerfile-slim-alpine
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 # Alexander Tebiev - https://github.com/beeyev/thumbor-s3-docker
 # Slim Thumbor docker image
-# docker buildx build --cache-to=type=inline --build-arg=BUILD_DATE=0000 --build-arg=BUILD_FINGERPRINT=0000 --pull --tag thumbor-slim-alpine --file ./docker/thumbor-7.6/Dockerfile-slim-alpine ./ && docker run -it --rm thumbor-slim-alpine
+# docker buildx build --cache-to=type=inline --build-arg=BUILD_DATE=0000 --build-arg=BUILD_FINGERPRINT=0000 --pull --tag thumbor-slim-alpine --file ./docker/thumbor-7.7/Dockerfile-slim-alpine ./ && docker run -it --rm thumbor-slim-alpine
 FROM python:3.11-alpine
 
 LABEL org.opencontainers.image.source=https://github.com/beeyev/thumbor-s3-docker
@@ -42,7 +42,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.6.* thumbor-aws==0.6.* tc_prometheus==2.* \
+        pycurl==7.* thumbor==7.7.* thumbor-aws==0.6.* tc_prometheus==2.* \
         "numpy==1.*,<1.24.0" \
     && thumbor --version && envtpl --help \
     ##