Skip to content

Commit

Permalink
Update 7.6
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-tebiev committed Oct 11, 2023
1 parent b390d49 commit caa137c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 5 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/callable-build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
DOCKERFILE_PATH:
required: true
type: string
PLATFORMS:
required: true
type: string
default: linux/amd64

jobs:
build-docker-image:
Expand All @@ -24,6 +28,11 @@ jobs:
uses: ./.github/actions/prepare-env-variables/
id: prepare-build-env-variables

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: ${{ inputs.PLATFORMS }}

- name: Set up Docker BuildX
uses: docker/setup-buildx-action@v3

Expand All @@ -43,7 +52,7 @@ jobs:
- name: Build image and push to registry - ${{ inputs.DOCKER_REGISTRY_IMAGE }}
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
platforms: ${{ inputs.PLATFORMS }}
context: .
file: ${{ inputs.DOCKERFILE_PATH }}
cache-from: type=registry,ref=${{ inputs.DOCKER_REGISTRY_IMAGE }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/merge-build-production-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
beeyev/thumbor-s3:${{ matrix.versionMinor }}-${{ matrix.baseDist }}
beeyev/thumbor-s3:${{ matrix.versionMajor }}-${{ matrix.baseDist }}
DOCKERFILE_PATH: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
PLATFORMS: linux/amd64,linux/arm64
secrets: inherit

update-docker-hub-repo-description:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-build-test-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ jobs:
with:
DOCKER_REGISTRY_IMAGE: ghcr.io/beeyev/thumbor-s3:${{ matrix.baseDist }}-test
DOCKERFILE_PATH: ./docker/thumbor-${{ matrix.versionMinor }}/Dockerfile-${{ matrix.baseDist }}
PLATFORMS: linux/amd64
secrets: inherit
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# [Thumbor S3 Docker](https://github.com/beeyev/thumbor-s3-docker)
> A docker image for Thumbor with AWS S3 / Minio integration for cropping, resizing, applying filters and optimizing images on the fly.
> A Docker image for Thumbor with AWS S3 and Minio integration, designed for on-the-fly image cropping, resizing, applying filters, and image optimization.
<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>

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

### All current docker images are packed with these features:
- AWS S3 / Minio integration support
Expand Down
2 changes: 1 addition & 1 deletion examples/read-from-S3-cache-to-S3/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Read-from-S3-cache-to-S3
### Use S3 storage as a source for images and another S3 storage to store cached results

1. Take a look at [`docker-compose.yml`](docker-compose.yml) example file, copy it to your machine.
1. Take a look at [`docker-compose.yml`](docker-compose.yml) example file, copy it to your local machine.
2. Run command `docker-compose up --build --no-deps --detach --remove-orphans` to spin up the containers.
3. Check that Thumbor container has started correctly by opening this url in your browser: http://localhost:8888/healthcheck

Expand Down
2 changes: 1 addition & 1 deletion examples/read-from-S3-cache-to-S3/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

services:
thumbor:
image: beeyev/thumbor-s3:7.6-slim-alpine
image: ghcr.io/beeyev/thumbor-s3:slim-alpine-test
restart: unless-stopped
tty: true
ports:
Expand Down

0 comments on commit caa137c

Please sign in to comment.