fix: rpm bundling and rpm key import
This commit is contained in:
parent
a29afd842e
commit
b4f675c082
|
|
@ -15,9 +15,11 @@ RUN apt-get update && \
|
||||||
python3-venv \
|
python3-venv \
|
||||||
# tool to create msi packages
|
# tool to create msi packages
|
||||||
wixl \
|
wixl \
|
||||||
# deb and rpm build tools
|
# install ruby and rpm which are required to install fpm package builder
|
||||||
rubygem-fpm \
|
|
||||||
rpm \
|
rpm \
|
||||||
|
ruby \
|
||||||
|
ruby-dev \
|
||||||
|
rubygems \
|
||||||
# create deb and rpm repository files
|
# create deb and rpm repository files
|
||||||
reprepro \
|
reprepro \
|
||||||
createrepo-c \
|
createrepo-c \
|
||||||
|
|
@ -25,6 +27,13 @@ RUN apt-get update && \
|
||||||
gcc-aarch64-linux-gnu \
|
gcc-aarch64-linux-gnu \
|
||||||
libc6-dev-arm64-cross && \
|
libc6-dev-arm64-cross && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
|
# Install fpm gem
|
||||||
|
gem install fpm --no-document && \
|
||||||
|
# Initialize rpm repository, SQL Lite DB
|
||||||
|
mkdir -p /var/lib/rpm && \
|
||||||
|
rpm --initdb && \
|
||||||
|
chmod -R 777 /var/lib/rpm && \
|
||||||
|
# Create work directory
|
||||||
mkdir -p opt
|
mkdir -p opt
|
||||||
|
|
||||||
WORKDIR /opt
|
WORKDIR /opt
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e -o pipefail
|
set -e -u -o pipefail
|
||||||
|
|
||||||
# Fetch cloudflared from the artifacts folder
|
# Fetch cloudflared from the artifacts folder
|
||||||
mv ./artifacts/cloudflared ./cloudflared
|
mv ./artifacts/cloudflared ./cloudflared
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e -o pipefail
|
set -e -u -o pipefail
|
||||||
|
|
||||||
OUTPUT=$(go run -mod=readonly golang.org/x/tools/cmd/goimports@v0.30.0 -l -d -local github.com/cloudflare/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc))
|
OUTPUT=$(go run -mod=readonly golang.org/x/tools/cmd/goimports@v0.30.0 -l -d -local github.com/cloudflare/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e -o pipefail
|
set -e -u -o pipefail
|
||||||
|
|
||||||
BRANCH="master"
|
BRANCH="master"
|
||||||
TMP_PATH="$PWD/tmp"
|
TMP_PATH="$PWD/tmp"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
set -e -u -o pipefail
|
||||||
VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
|
VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
|
||||||
echo $VERSION
|
echo $VERSION
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
set -e -u -o pipefail
|
||||||
|
|
||||||
# Check if architecture argument is provided
|
# Check if architecture argument is provided
|
||||||
if [ $# -eq 0 ]; then
|
if [ $# -eq 0 ]; then
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
set -e -u -o pipefail
|
||||||
|
|
||||||
python3 -m venv env
|
python3 -m venv env
|
||||||
. env/bin/activate
|
. env/bin/activate
|
||||||
pip install pynacl==1.4.0 pygithub==1.55
|
pip install pynacl==1.4.0 pygithub==1.55
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e -o pipefail
|
set -e -u -o pipefail
|
||||||
|
|
||||||
# Check if a make target is provided as an argument
|
# Check if a make target is provided as an argument
|
||||||
if [ $# -eq 0 ]; then
|
if [ $# -eq 0 ]; then
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e -u
|
||||||
|
|
||||||
# Define the file to store the list of vulnerabilities to ignore.
|
# Define the file to store the list of vulnerabilities to ignore.
|
||||||
IGNORE_FILE=".vulnignore"
|
IGNORE_FILE=".vulnignore"
|
||||||
|
|
|
||||||
|
|
@ -18,3 +18,4 @@ ssh_server_tests/.env
|
||||||
/.cover
|
/.cover
|
||||||
built_artifacts/
|
built_artifacts/
|
||||||
component-tests/.venv
|
component-tests/.venv
|
||||||
|
/artifacts
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue