Merge pull request #20 from citizensadvice/v2.1.0

v2.1.0

Author: danieldevlewis

.Dockerfile.swp

@@ -0,0 +1,62 @@
+name: Build and publish to public ECR
+
+on:
+  push:
+    branches:
+      - main
+      - "[0-9]*"
+      - "v[0-9]*"
+    tags:
+      - v*
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v3
+      - name: Build
+        run: |
+          docker build -t image-resizer .
+      - name: Lint
+        run: |
+          docker-compose run --rm app bundle exec rubocop
+      - name: Test
+        run: |
+          docker-compose run -e APP_ENV=test --rm app bundle exec rspec
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Extract repo name
+      shell: bash
+      run: echo "##[set-output name=repo_name;]$(echo ${GITHUB_REPOSITORY} | sed "s/.*\///g" | sed "s/-docker$//")"
+      id: extract_repo_name
+    - name: Docker meta
+      id: docker_meta
+      uses: crazy-max/ghaction-docker-meta@v1
+      with:
+        images: public.ecr.aws/citizensadvice/${{ steps.extract_repo_name.outputs.repo_name }}
+        tag-sha: true
+    - name: Login to AWS Elastic Container Registry
+      uses: docker/login-action@v1
+      with:
+        registry: public.ecr.aws
+        username: ${{ secrets.PUBLIC_PUSH_ECR_AWS_KEY }}
+        password: ${{ secrets.PUBLIC_PUSH_ECR_AWS_SECRET }}
+      env:
+        AWS_REGION: us-east-1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+    - name: Build and push
+      id: docker_build
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: ${{ steps.docker_meta.outputs.tags }}
+        labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/main.yml

@@ -1 +1 @@
-3.1.2
+3.2.0

.github/workflows/push.yml

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## v2.1.0 _2023-01-31_
+
+- `mime_type` param is no longer required. The application will now determine the mime-type.
+- `height` is now an optional parameter (default 800)
+- `width` is now an optional parameter (default 800)
+- svgs will now be optimised
+- inputs now have better validation
+- include newrelic_rpm
+
 ## v2.0.0 _2022-07-04_
 
 - Add arm64 compatibility

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-FROM ruby:3.1.2-alpine3.16 as builder
+FROM ruby:3.2.0-alpine3.17 as builder
 
 ENV LANG C.UTF-8
 WORKDIR /app
@@ -17,14 +17,14 @@ RUN gem install bundler \
 
 #################################################
 
-FROM ruby:3.1.2-alpine3.16
+FROM ruby:3.2.0-alpine3.17
 
 WORKDIR /app
 ENV RACK_ENV=production
 
 RUN apk update \
  && apk upgrade \
- && apk --no-cache add imagemagick tiff-tools
+ && apk --no-cache add imagemagick tiff-tools file gcompat
 
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 

.ruby-version

@@ -3,12 +3,15 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.2"
+ruby "3.2.0"
 
 gem "image_processing"
 gem "puma"
 gem "sinatra"
 gem "sinatra-contrib", require: false
+gem "svg_optimizer"
+
+gem "newrelic_rpm"
 
 group :development, :test do
   gem "citizens-advice-style", github: "citizensadvice/citizens-advice-style-ruby", tag: "v9.0.0"

CHANGELOG.md

@@ -26,12 +26,22 @@ GEM
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
+    newrelic_rpm (8.15.0)
     nio4r (2.5.8)
+    nokogiri (1.14.1-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.14.1-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.14.1-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
     puma (5.6.4)
       nio4r (~> 2.0)
+    racc (1.6.2)
     rack (2.2.4)
     rack-protection (2.2.0)
       rack
@@ -83,24 +93,31 @@ GEM
       rack-protection (= 2.2.0)
       sinatra (= 2.2.0)
       tilt (~> 2.0)
+    svg_optimizer (0.2.6)
+      nokogiri
     tilt (2.0.10)
     unicode-display_width (2.2.0)
 
 PLATFORMS
-  ruby
+  aarch64-linux-musl
+  arm64-darwin-21
+  x86_64-darwin-21
+  x86_64-linux-musl
 
 DEPENDENCIES
   citizens-advice-style!
   debug
   image_processing
+  newrelic_rpm
   puma
   rack-test
   rspec
   sinatra
   sinatra-contrib
+  svg_optimizer
 
 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.2.0p0
 
 BUNDLED WITH
-   2.3.17
+   2.4.5

Dockerfile

@@ -6,12 +6,16 @@ A Ruby app to resize images built with the Sinatra web framework and ImageMagick
 
 The endpoint for resizing images is `/image` and it requires the params posted as multi-part form data.
 
-- `mime_type` for example `image/png`
-- `image_file` for example an image in the format `.png, .jpg, .gif, and .tif`
+- `image_file` the image to be resized
+- `width` max width of the resized image in pixels. Defaults to 800
+- `height` max height of the resized image in pixels. Defaults to 800
 
-Image files in the format `TIFF` are converted to `PNG` automatically.
+Images will be resized maintaining their aspect ratio.
 
-The returned images are only resized if they have dimensions larger than `800px`, in which case they are resized maintaining their aspect ratio so their dimensions are a maximum of `900px`.
+Images that or not a png, gif, svg or jpeg will be converted to a png.
+The full list of supported image types is whatever installed version of imagemagick supports.
+
+SVG images will be optimised, but not have their dimensions modified.
 
 ## Local development