curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-2871: fix rpm builds

This commit is contained in:
Michael Borkenstein 2020-07-06 14:44:39 -05:00
parent ac3638f6b1
commit abfeebf67d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.docker-images
View File

@ -2,8 +2,6 @@ images:
- name: cloudflared - name: cloudflared
dockerfile: Dockerfile dockerfile: Dockerfile
context: . context: .
versions:
- latest
registries: registries:
- name: docker.io/cloudflare - name: docker.io/cloudflare
user: env:DOCKER_USER user: env:DOCKER_USER

8
Makefile
View File

@ -49,6 +49,12 @@ else
EXECUTABLE_PATH=./cloudflared EXECUTABLE_PATH=./cloudflared
endif endif
ifeq ($(FLAVOR), centos-7)
TARGET_PUBLIC_REPO ?= el7
else
TARGET_PUBLIC_REPO ?= $(FLAVOR)
endif
.PHONY: all .PHONY: all
all: cloudflared test all: cloudflared test
@ -75,7 +81,7 @@ test-ssh-server:
define publish_package define publish_package
for HOST in $(CF_PKG_HOSTS); do \ for HOST in $(CF_PKG_HOSTS); do \
ssh-keyscan -t rsa $$HOST >> ~/.ssh/known_hosts; \ ssh-keyscan -t rsa $$HOST >> ~/.ssh/known_hosts; \
scp -4 cloudflared_$(VERSION)_amd64.deb cfsync@$$HOST:/state/cf-pkg/staging/$(1)/$(FLAVOR)/cloudflared/; \ scp -4 cloudflared_$(VERSION)_amd64.deb cfsync@$$HOST:/state/cf-pkg/staging/$(1)/$(TARGET_PUBLIC_REPO)/cloudflared/; \
done done
endef endef