Skip to content

Commit

Permalink
pin to 3.10 (#218)
Browse files Browse the repository at this point in the history
* pin to 3.10

* mkdir
  • Loading branch information
osterman authored Jul 5, 2019
1 parent b0e8c7b commit 155b218
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions apk/Dockerfile-3.10
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions codefresh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 155b218

Please sign in to comment.