Adding aws cli v2

1.19 is the default stretch based images no longer build with the current dockerfile, removed from the automation
TykTechnologies · Aug 2, 2023 · fa5d69d · fa5d69d
1 parent 8612765
commit fa5d69d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 27 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,34 +16,15 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.17"
-          - "1.18"
+          - "1.16"
           - "1.19"
-          - "1.20"
         debver:
-          - buster
           - bullseye
         include:
-          - gover: "1.15"
-            debver: stretch
-            tag: "1.15-el7"
-          - gover: "1.15"
-            debver: buster
-            tag: "1.15"
-          - gover: "1.16"
-            debver: stretch
-            tag: "1.16-el7"
-          - gover: "1.16"
-            debver: buster
-            tag: "1.16"
-          - gover: "1.16"
-            debver: buster
-            tag: "1.16-buster"
           - gover: "1.16"
             debver: bullseye
-            tag: "1.16-bullseye"
+            tag: "1.16"
 
-
     runs-on: ubuntu-latest
 
     steps:
@@ -67,4 +48,4 @@ jobs:
         tags: tykio/golang-cross:${{ matrix.tag || format( '{0}-{1}', matrix.gover,  matrix.debver) }}
         build-args: |
           GO_VERSION=${{ matrix.gover }}
-          DEB_VERSION=${{ matrix.debver }}
+          DEB_VERSION=${{ matrix.debver }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,15 @@
 # Committs to master will trigger a push to Dockerhub
 
-ARG GO_VERSION=1.15.15
-ARG DEB_VERSION=stretch
+ARG GO_VERSION=1.19.12
+ARG DEB_VERSION=bullseye
 
 FROM golang:${GO_VERSION}-${DEB_VERSION} AS base
 
 ARG DEB_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 # Install deps
-RUN echo "Starting image build for $(grep PRETTY_NAME /etc/os-release)" \
- && dpkg --add-architecture arm64                      \
- && dpkg --add-architecture ppc64el                      \
+RUN dpkg --add-architecture arm64                      \
+ && dpkg --add-architecture ppc64el                    \
  && dpkg --add-architecture s390x                      \
  && apt-get update                                     \
  && apt-get dist-upgrade -y -q                         \
@@ -52,6 +51,10 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
     echo "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \
     apt-get update && apt-get install -y docker-ce-cli
 
+# Install AWS CLI v2
+RUN curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" && \
+    cd /tmp && unzip awscliv2.zip && sudo ./aws/install --bin-dir /usr/bin --install-dir /usr/aws-cliv2
+
 COPY upgrade-git-on-stretch.sh /
 RUN /upgrade-git-on-stretch.sh ${DEB_VERSION}
 RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*