Merge pull request #4 from luthersystems/sam-at-luther/Fix_azcli_deps

Sam at luther/fix azcli deps
luthersystems · Jun 3, 2022 · 6f6adaf · 6f6adaf
2 parents 3b75b43 + 9944e50
commit 6f6adaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/images/Dockerfile.build-godynamic b/images/Dockerfile.build-godynamic
@@ -35,9 +35,9 @@ ENV GOPATH=/go
 ENV PATH=/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 WORKDIR /go
-RUN apk add --no-cache ca-certificates tzdata libltdl rsync zip openssh git-lfs bash shadow gcc musl-dev make linux-headers curl tini gcompat python3 jq
+RUN apk add --no-cache ca-certificates tzdata libltdl rsync zip openssh git-lfs bash shadow gcc musl-dev make linux-headers curl tini gcompat python3 jq py3-pip
 
-RUN apk add --update docker openrc
+RUN apk add --no-cache docker docker-compose openrc
 RUN rc-update add docker boot
 
 COPY build-godynamic.mk /opt/Dockerfile.godynamic.mk

diff --git a/images/Dockerfile.build-js b/images/Dockerfile.build-js
@@ -16,7 +16,7 @@ RUN gpg --verify awscliv2.sig awscliv2.zip
 FROM node:14.19-bullseye
 MAINTAINER Sam Wood <sam.wood@luthersystems.com>
 
-RUN apt-get update && apt-get install --no-install-recommends -y libltdl-dev rsync zip git-lfs tini ca-certificates docker.io apt-transport-https lsb-release gnupg && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install --no-install-recommends -y libltdl-dev rsync zip git-lfs tini ca-certificates docker.io apt-transport-https lsb-release gnupg python2 python2-dev && rm -rf /var/lib/apt/lists/*
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 
 RUN npm install -g npm