Skip to content

Commit e5926bd

Browse files
committed
Upgrade AWS cli to v2
1 parent 23542e5 commit e5926bd

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
type=sha,format=long,prefix=
3333
3434
- name: Build Docker image
35-
uses: docker/build-push-action@v5
35+
uses: docker/build-push-action@v6
3636
with:
3737
load: true
3838
push: false
@@ -71,7 +71,7 @@ jobs:
7171
type=sha,format=long,prefix=
7272
7373
- name: Build and push Docker image
74-
uses: docker/build-push-action@v5
74+
uses: docker/build-push-action@v6
7575
with:
7676
push: true
7777
platforms: ${{ env.PLATFORMS }}

Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
FROM alpine:3.19
1+
FROM ghcr.io/sparkfabrik/docker-alpine-aws-cli:2.25.6-alpine3.20 as awscli
22

3-
RUN apk add --no-cache file gettext jq rclone mysql-client mariadb-connector-c postgresql-client bash curl aws-cli
3+
FROM alpine:3.20
44

5+
RUN apk add --no-cache file gettext jq rclone mysql-client mariadb-connector-c postgresql-client bash curl
6+
7+
# Install AWS CLI v2 using the binary builded in the awscli stage
8+
COPY --from=awscli /usr/local/aws-cli/ /usr/local/aws-cli/
9+
RUN ln -s /usr/local/aws-cli/v2/current/bin/aws /usr/local/bin/aws \
10+
&& ln -s /usr/local/aws-cli/v2/current/bin/aws_completer /usr/local/bin/aws_completer
11+
12+
# Install wait-for-it
513
RUN curl -o /usr/local/bin/wait-for-it https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
614
chmod +x /usr/local/bin/wait-for-it
715

816
# Make the terminal pretty and add node_modules binaries to PATH
9-
RUN echo "whoami &>/dev/null && PS1='\[\033[1;36m\]\u\[\033[1;31m\]@\[\033[1;32m\]\h:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] ' || PS1='\[\033[1;36m\]unknown\[\033[1;31m\]@\[\033[1;32m\]\h:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] '" >> /etc/profile \
10-
&& echo "export TERM=xterm" >> /etc/profile
17+
RUN echo "whoami &>/dev/null && PS1='\[\033[1;36m\]\u\[\033[1;31m\]@\[\033[1;32m\]\h:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] ' || PS1='\[\033[1;36m\]unknown\[\033[1;31m\]@\[\033[1;32m\]\h:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] '" >>/etc/profile \
18+
&& echo "export TERM=xterm" >>/etc/profile
1119

1220
COPY app /app
1321

0 commit comments

Comments
 (0)