Skip to content

Commit

Permalink
Merge pull request #18 from sparkfabrik/feat/upgrade_2.17.7_3.20
Browse files Browse the repository at this point in the history
feat(upgrade): upgrade AWS cli version to 2.17.7 and add support for alpine 3.20
  • Loading branch information
Monska85 authored Jul 3, 2024
2 parents e9c181e + 79ea928 commit 6d33024
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
matrix:
tag:
# To keep the number of builds low, we only keep the latest two versions of the AWS CLI
- 2.17.7-3.11.9-3.20
- 2.17.7-3.11.9-3.19
- 2.16.7-3.11.9-3.20
- 2.16.7-3.11.9-3.19
- 2.16.7-3.11.9-3.18
- 2.15.42-3.11.9-3.19
- 2.15.42-3.11.9-3.18
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -69,10 +69,10 @@ jobs:
matrix:
tag:
# To keep the number of builds low, we only keep the latest two versions of the AWS CLI
- 2.17.7-3.11.9-3.20
- 2.17.7-3.11.9-3.19
- 2.16.7-3.11.9-3.20
- 2.16.7-3.11.9-3.19
- 2.16.7-3.11.9-3.18
- 2.15.42-3.11.9-3.19
- 2.15.42-3.11.9-3.18
steps:
- uses: actions/checkout@v4

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG PYTHON_VERSION=3.11.9
ARG ALPINE_VERSION=3.19
ARG ALPINE_VERSION=3.20

FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} as builder

ARG AUTHOR
ARG PYTHON_VERSION=3.11.9
ARG ALPINE_VERSION=3.19
ARG ALPINE_VERSION=3.20
ARG IMAGE_NAME=spark-alpine-aws-cli
ARG AWS_CLI_VERSION=2.16.7
ARG AWS_CLI_VERSION=2.17.7

# Build process
# If you want to see the AWS CLI v2 documentation, remember to go to the `v2` branch.
Expand Down
34 changes: 17 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
AUTHOR ?= sparkfabrik
IMAGE_NAME ?= docker-alpine-aws-cli
PLATFORM ?= "linux/amd64"
LATEST_VERSION ?= 2.16.7-alpine3.19
LATEST_VERSION ?= 2.17.7-alpine3.20

build: build-2.16.7-3.19
build: build-2.17.7-3.20

# To keep the number of builds low, we only keep the latest two versions of the AWS CLI
build-2.17.7-3.20: AWS_CLI_VERSION="2.17.7"
build-2.17.7-3.20: PYTHON_VERSION="3.11.9"
build-2.17.7-3.20: ALPINE_VERSION="3.20"
build-2.17.7-3.20: build-template

build-2.17.7-3.19: AWS_CLI_VERSION="2.17.7"
build-2.17.7-3.19: PYTHON_VERSION="3.11.9"
build-2.17.7-3.19: ALPINE_VERSION="3.19"
build-2.17.7-3.19: build-template

build-2.16.7-3.20: AWS_CLI_VERSION="2.16.7"
build-2.16.7-3.20: PYTHON_VERSION="3.11.9"
build-2.16.7-3.20: ALPINE_VERSION="3.20"
build-2.16.7-3.20: build-template

build-2.16.7-3.19: AWS_CLI_VERSION="2.16.7"
build-2.16.7-3.19: PYTHON_VERSION="3.11.9"
build-2.16.7-3.19: ALPINE_VERSION="3.19"
build-2.16.7-3.19: build-template

build-2.16.7-3.18: AWS_CLI_VERSION="2.16.7"
build-2.16.7-3.18: PYTHON_VERSION="3.11.9"
build-2.16.7-3.18: ALPINE_VERSION="3.18"
build-2.16.7-3.18: build-template

build-2.15.42-3.19: AWS_CLI_VERSION="2.15.42"
build-2.15.42-3.19: PYTHON_VERSION="3.11.9"
build-2.15.42-3.19: ALPINE_VERSION="3.19"
build-2.15.42-3.19: build-template

build-2.15.42-3.18: AWS_CLI_VERSION="2.15.42"
build-2.15.42-3.18: PYTHON_VERSION="3.11.9"
build-2.15.42-3.18: ALPINE_VERSION="3.18"
build-2.15.42-3.18: build-template

build-template:
docker buildx build --load . \
--platform "$(PLATFORM)" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Docker image for AWS-CLI v2 on Alpine Linux.
You can import the compiled binary created in this image in your Alpine Linux image.

```bash
FROM ghcr.io/sparkfabrik/docker-alpine-aws-cli:2.16.7-alpine3.19 as awscli
FROM ghcr.io/sparkfabrik/docker-alpine-aws-cli:2.17.7-alpine3.20 as awscli

FROM alpine:3.19
# Install AWS CLI v2 using the binary builded in the awscli stage
Expand Down

0 comments on commit 6d33024

Please sign in to comment.