From 79e01a1d9c762bf049693b678665feae05baac57 Mon Sep 17 00:00:00 2001 From: Sam Wood Date: Thu, 26 May 2022 14:04:33 -0700 Subject: [PATCH 1/3] Skip build on main merge --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf88a7a..c0cf93b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,11 +52,15 @@ workflows: filters: tags: only: /.*/ + branches: + ignore: main - build-arm64: context: dockerhubsecret filters: tags: only: /.*/ + branches: + ignore: main - push-multiarch-image: context: dockerhubsecret requires: From 9cda62f3649863742ffe8ed78d8a07e3c56745bf Mon Sep 17 00:00:00 2001 From: Sam Wood Date: Fri, 3 Jun 2022 07:38:29 -0700 Subject: [PATCH 2/3] Fix azcli deps in godynamic --- images/Dockerfile.build-godynamic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/Dockerfile.build-godynamic b/images/Dockerfile.build-godynamic index 9cc4bf5..371dcee 100644 --- 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 From 9944e50d3378ef2ce0bea7efa03e8f9bce66c3be Mon Sep 17 00:00:00 2001 From: Sam Wood Date: Fri, 3 Jun 2022 08:17:07 -0700 Subject: [PATCH 3/3] Add missing deps for js build --- images/Dockerfile.build-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/Dockerfile.build-js b/images/Dockerfile.build-js index 7661cfb..d7095c5 100644 --- 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 -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