mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2024-12-21 13:57:49 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
dbe3aa1efc
17
.github/workflows/badstrings.yml
vendored
17
.github/workflows/badstrings.yml
vendored
@ -1,17 +0,0 @@
|
|||||||
name: badstrings
|
|
||||||
on: [pull_request, push]
|
|
||||||
jobs:
|
|
||||||
badstrings:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: scanning commit message for bad strings
|
|
||||||
run: |
|
|
||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
IFS=$'\n\t'
|
|
||||||
message="${{ github.event.head_commit.message }}"
|
|
||||||
|
|
||||||
strings=($(curl -s https://raw.githubusercontent.com/someara/badstrings/main/strings.txt))
|
|
||||||
for i in ${strings[@]} ; do
|
|
||||||
echo "${message}" | grep -v "$i" &>/dev/null;
|
|
||||||
done
|
|
@ -7,11 +7,11 @@ FROM debian:buster-slim as builder
|
|||||||
RUN apt-get update && apt-get install -y curl gnupg
|
RUN apt-get update && apt-get install -y curl gnupg
|
||||||
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61 && \
|
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61 && \
|
||||||
echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
|
echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
|
||||||
RUN apt-get update && apt-get install -y zerotier-one=1.6.2
|
RUN apt-get update && apt-get install -y zerotier-one=1.8.4
|
||||||
COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh
|
COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh
|
||||||
|
|
||||||
FROM debian:buster-slim
|
FROM debian:buster-slim
|
||||||
LABEL version="1.6.3"
|
LABEL version="1.8.4"
|
||||||
LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
|
LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
|
||||||
|
|
||||||
# ZeroTier relies on UDP port 9993
|
# ZeroTier relies on UDP port 9993
|
||||||
|
Loading…
Reference in New Issue
Block a user