homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge current branch v2.4 into master

Browse source
This commit is contained in:
Jean-Baptiste Doumenjou 2021-03-09 11:32:01 +01:00
commit 702e301990
100 changed files with 561 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

10
script/deploy.sh
View file

@ -12,8 +12,10 @@ git config --global user.email "$TRAEFIKER_EMAIL"
git config --global user.name "Traefiker"
# load ssh key
: "${encrypted_83c521e11abe_key:?}" # ensures variable is defined
: "${encrypted_83c521e11abe_iv:?}" # same
echo "Loading key..."
openssl aes-256-cbc -K $encrypted_83c521e11abe_key -iv $encrypted_83c521e11abe_iv -in .travis/traefiker_rsa.enc -out ~/.ssh/traefiker_rsa -d
openssl aes-256-cbc -K "$encrypted_83c521e11abe_key" -iv "$encrypted_83c521e11abe_iv" -in .travis/traefiker_rsa.enc -out ~/.ssh/traefiker_rsa -d
eval "$(ssh-agent -s)"
chmod 600 ~/.ssh/traefiker_rsa
ssh-add ~/.ssh/traefiker_rsa
@ -22,10 +24,10 @@ ssh-add ~/.ssh/traefiker_rsa
echo "Updating traefik-library-imag repo..."
git clone git@github.com:traefik/traefik-library-image.git
cd traefik-library-image
./updatev2.sh $VERSION
./updatev2.sh "$VERSION"
git add -A
echo $VERSION | git commit --file -
echo $VERSION | git tag -a $VERSION --file -
echo "$VERSION" | git commit --file -
echo "$VERSION" | git tag -a "$VERSION" --file -
git push -q --follow-tags -u origin master > /dev/null 2>&1
cd ..

6
script/gcg/traefik-bugfix.toml
View file

@ -4,11 +4,11 @@ RepositoryName = "traefik"
OutputType = "file"
FileName = "traefik_changelog.md"
# example new bugfix v2.4.5
# example new bugfix v2.4.7
CurrentRef = "v2.4"
PreviousRef = "v2.4.4"
PreviousRef = "v2.4.6"
BaseBranch = "v2.4"
FutureCurrentRefName = "v2.4.5"
FutureCurrentRefName = "v2.4.7"
ThresholdPreviousRef = 10
ThresholdCurrentRef = 10