Skip to content

Commit 04ce1ba

Browse files
authored
Merge pull request #28 from beeyev/7.6
Update 7.6
2 parents 88bbcdb + caa137c commit 04ce1ba

File tree

11 files changed

+191
-167
lines changed

11 files changed

+191
-167
lines changed

.github/workflows/callable-build-docker-image.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
DOCKERFILE_PATH:
99
required: true
1010
type: string
11+
PLATFORMS:
12+
required: true
13+
type: string
14+
default: linux/amd64
1115

1216
jobs:
1317
build-docker-image:
@@ -24,6 +28,11 @@ jobs:
2428
uses: ./.github/actions/prepare-env-variables/
2529
id: prepare-build-env-variables
2630

31+
- name: Set up QEMU
32+
uses: docker/setup-qemu-action@v3
33+
with:
34+
platforms: ${{ inputs.PLATFORMS }}
35+
2736
- name: Set up Docker BuildX
2837
uses: docker/setup-buildx-action@v3
2938

@@ -43,7 +52,7 @@ jobs:
4352
- name: Build image and push to registry - ${{ inputs.DOCKER_REGISTRY_IMAGE }}
4453
uses: docker/build-push-action@v5
4554
with:
46-
platforms: linux/amd64
55+
platforms: ${{ inputs.PLATFORMS }}
4756
context: .
4857
file: ${{ inputs.DOCKERFILE_PATH }}
4958
cache-from: type=registry,ref=${{ inputs.DOCKER_REGISTRY_IMAGE }}

.github/workflows/merge-build-production-docker-images.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
baseDist: [ 'slim-alpine', 'alpine' ]
24-
versionMinor: [ '7.5' ]
24+
versionMinor: [ '7.6' ]
2525
versionMajor: [ '7' ]
2626
name: Build Production Docker Images / ${{ matrix.versionMinor }}-${{ matrix.baseDist }}
2727
with:
@@ -33,6 +33,7 @@ jobs:
3333
beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
3434
beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
3535
DOCKERFILE_PATH: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
36+
PLATFORMS: linux/amd64,linux/arm64
3637
secrets: inherit
3738

3839
update-docker-hub-repo-description:

.github/workflows/pr-build-test-docker-image.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
baseDist: [ 'slim-alpine', 'alpine' ]
42-
versionMinor: [ '7.5' ]
42+
versionMinor: [ '7.6' ]
4343
name: Build Test Docker Images / ${{ matrix.baseDist }}-test
4444
with:
4545
DOCKER_REGISTRY_IMAGE: ghcr.io/beeyev/thumbor-s3:${{ matrix.baseDist }}-test
4646
DOCKERFILE_PATH: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
47+
PLATFORMS: linux/amd64
4748
secrets: inherit

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# [Thumbor S3 Docker](https://github.com/beeyev/thumbor-s3-docker)
2-
> A docker image for Thumbor with AWS S3 / Minio integration for cropping, resizing, applying filters and optimizing images on the fly.
2+
> A Docker image for Thumbor with AWS S3 and Minio integration, designed for on-the-fly image cropping, resizing, applying filters, and image optimization.
33
44
<p align="center"><a href="https://github.com/beeyev/thumbor-s3-docker"><img src="https://github.com/beeyev/thumbor-s3-docker/raw/master/docs/img/thumbor-s3-docker.jpg"></a></p>
55

66
## A little of introduction
7-
Thumbor S3 Docker is available in two variants of docker images, lightweight (slim) - `slim-alpine` and full-featured - `alpine`.
7+
Thumbor S3 Docker is available in two variants of docker images, a lightweight (slim) - `slim-alpine` and a full-featured - `alpine`.
88

99
### All current docker images are packed with these features:
1010
- AWS S3 / Minio integration support
@@ -26,8 +26,8 @@ Thumbor S3 Docker is available in two variants of docker images, lightweight (sl
2626
`thumbor-s3:slim-alpine`
2727
`thumbor-s3:7-alpine`
2828
`thumbor-s3:7-slim-alpine`
29-
`thumbor-s3:7.5-alpine`
30-
`thumbor-s3:7.5-slim-alpine`
29+
`thumbor-s3:7.6-alpine`
30+
`thumbor-s3:7.6-slim-alpine`
3131

3232
[Docker Hub](https://hub.docker.com/r/beeyev/thumbor-s3) | [Github packages](https://github.com/beeyev/thumbor-s3-docker/pkgs/container/thumbor-s3)
3333

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
thumbor:
1010
container_name: 'thumbor'
1111
build:
12-
dockerfile: ./docker/thumbor-7.5/Dockerfile-slim-alpine
12+
dockerfile: ./docker/thumbor-7.6/Dockerfile-slim-alpine
1313
context: ./
1414
args:
1515
- 'BUILDKIT_INLINE_CACHE=1'

docker/config/etc/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ printf "\n\n${GRN}--->${NC} $($(which thumbor) --version)"
5050
printf "\n${GRN}--->${NC} Starting Thumbor on port: ${GRN}${PORT}${NC}, log level: ${GRN}${LOG_LEVEL}${NC}, CPU cores available: ${GRN}${NUM_CPUS}${NC}"
5151
printf "\n${GRN}--->${NC} Exec command: ${GRY}${THUMBOR_EXEC}${NC}"
5252
printf "\n${GRN}--->${NC} Docker image build date: ${GRY}${BUILD_DATE}${NC}, fingerprint: ${GRY}${BUILD_FINGERPRINT}${NC}"
53-
printf "\n${GRN}--->${NC} Docker image project website: ${GRY}https://github.com/beeyev/thumbor-s3-docker${NC}\n\n"
53+
printf "\n${GRN}--->${NC} Docker image project url: ${GRY}https://github.com/beeyev/thumbor-s3-docker${NC}\n\n"
5454
exec ${THUMBOR_EXEC}
5555

0 commit comments

Comments
 (0)