Skip to content

Commit

Permalink
Base/0.6.6 (#488)
Browse files Browse the repository at this point in the history
* Fix base dockerfile
  • Loading branch information
blakelead committed May 25, 2021
1 parent 04b1920 commit 8bb03cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 4 additions & 0 deletions docker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.6.6 - 2021-05-25
### Fixed
- dockerfile dependencies issues

## 0.6.4 - 2021-05-25
### Fixed
- aws cli error
Expand Down
15 changes: 8 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:alpine3.12
FROM golang:alpine3.13

# https://pypi.org/project/awscli/
ENV AWSCLI_VERSION=1.17.0
Expand Down Expand Up @@ -28,13 +28,14 @@ RUN sudo ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Install base and dev packages
RUN sudo apk update && \
sudo apk add bash curl ca-certificates unzip git expect tini apache2-utils bison flex gettext
sudo apk -Uuv add groff less bash curl ca-certificates unzip git expect tini apache2-utils bison flex gettext build-base

# aws-cli
RUN sudo apk -Uuv add groff less python2 python2-dev py-pip python3 build-base && \
sudo pip install awscli==$AWSCLI_VERSION && \
sudo apk --purge -v del py-pip && \
sudo rm -rf /var/cache/apk/*
RUN sudo apk add python3 curl && \
sudo ln -sf python3 /usr/bin/python && \
sudo curl "https://s3.amazonaws.com/aws-cli/awscli-bundle-$AWSCLI_VERSION.zip" -o "awscli-bundle.zip" && \
sudo unzip awscli-bundle.zip && \
sudo ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws

# aws-iam-authenticator
RUN sudo wget -q https://amazon-eks.s3-us-west-2.amazonaws.com/${AWS_IAM_AUTHENTICATOR}/2019-06-11/bin/linux/amd64/aws-iam-authenticator -O /usr/local/bin/aws-iam-authenticator && \
Expand Down Expand Up @@ -74,7 +75,7 @@ RUN sudo curl -L https://github.com/mikefarah/yq/releases/download/2.4.1/yq_linu
# boxes (https://boxes.thomasjensen.com/)
RUN sudo wget -q https://github.com/ascii-boxes/boxes/archive/v1.3.zip -O boxes-1.3.zip && \
sudo unzip -q boxes-1.3.zip && \
sudo make -C boxes-1.3 -s 2>/dev/null 1>/dev/null || true && \
sudo make -C boxes-1.3 && \
sudo cp boxes-1.3/src/boxes /usr/local/bin && \
sudo cp boxes-1.3/boxes-config /usr/share/boxes && \
sudo rm -rf boxes-1.3 boxes-1.3.zip
Expand Down

0 comments on commit 8bb03cc

Please sign in to comment.