Skip to content

Commit

Permalink
Merge pull request #28 from beeyev/7.6
Browse files Browse the repository at this point in the history
Update 7.6
  • Loading branch information
beeyev authored Oct 11, 2023
2 parents 88bbcdb + caa137c commit 04ce1ba
Show file tree
Hide file tree
Showing 11 changed files with 191 additions and 167 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
3 changes: 2 additions & 1 deletion .github/workflows/merge-build-production-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
baseDist: [ 'slim-alpine', 'alpine' ]
versionMinor: [ '7.5' ]
versionMinor: [ '7.6' ]
versionMajor: [ '7' ]
name: Build Production Docker Images / ${{ matrix.versionMinor }}-${{ matrix.baseDist }}
with:
Expand All @@ -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
3 changes: 2 additions & 1 deletion .github/workflows/pr-build-test-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ jobs:
fail-fast: false
matrix:
baseDist: [ 'slim-alpine', 'alpine' ]
versionMinor: [ '7.5' ]
versionMinor: [ '7.6' ]
name: Build Test Docker Images / ${{ matrix.baseDist }}-test
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
8 changes: 4 additions & 4 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 All @@ -26,8 +26,8 @@ Thumbor S3 Docker is available in two variants of docker images, lightweight (sl
`thumbor-s3:slim-alpine`
`thumbor-s3:7-alpine`
`thumbor-s3:7-slim-alpine`
`thumbor-s3:7.5-alpine`
`thumbor-s3:7.5-slim-alpine`
`thumbor-s3:7.6-alpine`
`thumbor-s3:7.6-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)

Expand Down
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
thumbor:
container_name: 'thumbor'
build:
dockerfile: ./docker/thumbor-7.5/Dockerfile-slim-alpine
dockerfile: ./docker/thumbor-7.6/Dockerfile-slim-alpine
context: ./
args:
- 'BUILDKIT_INLINE_CACHE=1'
Expand Down
2 changes: 1 addition & 1 deletion docker/config/etc/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ printf "\n\n${GRN}--->${NC} $($(which thumbor) --version)"
printf "\n${GRN}--->${NC} Starting Thumbor on port: ${GRN}${PORT}${NC}, log level: ${GRN}${LOG_LEVEL}${NC}, CPU cores available: ${GRN}${NUM_CPUS}${NC}"
printf "\n${GRN}--->${NC} Exec command: ${GRY}${THUMBOR_EXEC}${NC}"
printf "\n${GRN}--->${NC} Docker image build date: ${GRY}${BUILD_DATE}${NC}, fingerprint: ${GRY}${BUILD_FINGERPRINT}${NC}"
printf "\n${GRN}--->${NC} Docker image project website: ${GRY}https://github.com/beeyev/thumbor-s3-docker${NC}\n\n"
printf "\n${GRN}--->${NC} Docker image project url: ${GRY}https://github.com/beeyev/thumbor-s3-docker${NC}\n\n"
exec ${THUMBOR_EXEC}

Loading

0 comments on commit 04ce1ba

Please sign in to comment.