Skip to content

Commit

Permalink
Merge pull request #19 from sparkfabrik/feat/upgrade_awscli_2.17.44
Browse files Browse the repository at this point in the history
feat: upgrade AWS CLI to 2.17.44
  • Loading branch information
Monska85 authored Sep 5, 2024
2 parents 6d33024 + d197ea6 commit 0e2eb3f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 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.44-3.11.9-3.20
- 2.17.44-3.11.9-3.19
- 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
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.44-3.11.9-3.20
- 2.17.44-3.11.9-3.19
- 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
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG AUTHOR
ARG PYTHON_VERSION=3.11.9
ARG ALPINE_VERSION=3.20
ARG IMAGE_NAME=spark-alpine-aws-cli
ARG AWS_CLI_VERSION=2.17.7
ARG AWS_CLI_VERSION=2.17.44

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

build: build-2.17.7-3.20
build: build-2.17.44-3.20

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

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

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"
Expand All @@ -16,16 +26,6 @@ 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-template:
docker buildx build --load . \
--platform "$(PLATFORM)" \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ 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.17.7-alpine3.20 as awscli
FROM ghcr.io/sparkfabrik/docker-alpine-aws-cli:2.17.44-alpine3.20 as awscli

FROM alpine:3.19
FROM alpine:3.20
# Install AWS CLI v2 using the binary builded in the awscli stage
COPY --from=awscli /usr/local/aws-cli/ /usr/local/aws-cli/
RUN ln -s /usr/local/aws-cli/v2/current/bin/aws /usr/local/bin/aws \
Expand Down

0 comments on commit 0e2eb3f

Please sign in to comment.