From 155b218a92bd2d8a8bfd441d9326463c10146938 Mon Sep 17 00:00:00 2001 From: Erik Osterman Date: Fri, 5 Jul 2019 15:32:02 -0700 Subject: [PATCH] pin to 3.10 (#218) * pin to 3.10 * mkdir --- Makefile | 2 +- apk/Dockerfile-3.10 | 3 +-- codefresh/Makefile | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7d445f73e1..4a621f30c6 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ export README_DEPS ?= docs/targets.md export DIST_CMD ?= cp -a export DIST_PATH ?= /dist export INSTALL_PATH ?= /usr/local/bin -export ALPINE_VERSION ?= 3.8 +export ALPINE_VERSION ?= 3.10 -include $(shell curl -sSL -o .build-harness "https://git.io/build-harness"; echo .build-harness) diff --git a/apk/Dockerfile-3.10 b/apk/Dockerfile-3.10 index ad1eb57c22..08d6f5897a 100644 --- a/apk/Dockerfile-3.10 +++ b/apk/Dockerfile-3.10 @@ -2,8 +2,7 @@ FROM alpine:3.10 # Install the cloudposse alpine repository ADD https://apk.cloudposse.com/ops@cloudposse.com.rsa.pub /etc/apk/keys/ -# Due to a cold-start problem of adding a new distro, we pin to 3.9 so we can satisfy deps -RUN echo "https://apk.cloudposse.com/3.9/vendor" >> /etc/apk/repositories +RUN echo "https://apk.cloudposse.com/3.10/vendor" >> /etc/apk/repositories RUN echo "https://alpine.global.ssl.fastly.net/alpine/edge/testing" >> /etc/apk/repositories RUN echo "https://alpine.global.ssl.fastly.net/alpine/edge/community" >> /etc/apk/repositories diff --git a/codefresh/Makefile b/codefresh/Makefile index 49c3e53583..f7e251d8af 100644 --- a/codefresh/Makefile +++ b/codefresh/Makefile @@ -6,6 +6,7 @@ export PACKAGER_PRIVKEY=$(CF_VOLUME_PATH)/$(PACKAGER).rsa export PACKAGER_PUBKEY=$(APK_PACKAGES_PATH)/$(PACKAGER).rsa.pub export: + @mkdir -p $(APK_PACKAGES_PATH) @echo "$(KEY_RSA)" | base64 -d > $(PACKAGER_PRIVKEY) @openssl rsa -in $(PACKAGER_PRIVKEY) -pubout > $(PACKAGER_PUBKEY) @echo PACKAGER_PRIVKEY=$(PACKAGER_PRIVKEY) >> $(CF_VOLUME_PATH)/env_vars_to_export