Chewing_Bever
/
fej
1
0
Fork 0
Code Issues 28 Pull Requests 10 Projects 3 Releases 4 Wiki Activity

Fixed strange dc behavior

master^2
Jef Roosens 2021-04-17 17:46:16 +02:00
parent 43e26191cc
commit 95f45cab76
Signed by: Jef Roosens
GPG Key ID: 955C0660072F691F
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fejctl
View File

@ -8,7 +8,10 @@ image='chewingbever/fej'
# -b: build the builder # -b: build the builder
# -r: use the release image instead # -r: use the release image instead
function dc() { function dc() {
local OPTIND c build_builder release
while getopts ":br" c; do while getopts ":br" c; do
echo "$c"
case $c in case $c in
b ) build_builder=1 ;; b ) build_builder=1 ;;
r ) release=1 ;; r ) release=1 ;;
@ -52,7 +55,7 @@ function dcr() {
# Tags & pushes the release version to Docker Hub # Tags & pushes the release version to Docker Hub
function publish() { function publish() {
branch=`git rev-parse --abbrev-ref HEAD` local branch=`git rev-parse --abbrev-ref HEAD`
if [[ "$branch" != master ]]; then if [[ "$branch" != master ]]; then
>&2 echo "You can only publish from master." >&2 echo "You can only publish from master."
@ -62,10 +65,10 @@ function publish() {
# Build the release images # Build the release images
dc -br build dc -br build
patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1` local patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'` local major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'` local minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
tags=("latest" "$patch_version" "$minor_version" "$major_version") local tags=("latest" "$patch_version" "$minor_version" "$major_version")
for tag in "${tags[@]}"; do for tag in "${tags[@]}"; do
# Create the tag # Create the tag
@ -86,8 +89,8 @@ function publish() {
# $2: binary to use, defaults to 'server' # $2: binary to use, defaults to 'server'
function main() { function main() {
# Default values # Default values
cmd="${1:-build}" local cmd="${1:-build}"
bin="${2:-server}" local bin="${2:-server}"
case $cmd in case $cmd in
# Building # Building