[#26] fejctl now fully replace Makefile & build
parent
0ba31bd8ba
commit
0828dd36d6
GPG Key ID:
955C0660072F691F
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# This hook lints the code, and if we're on develop or master, also forces the tests to pass.
|
||||
make lint &> /dev/null 2>&1 || {
|
||||
./fejctl lint &> /dev/null 2>&1 || {
|
||||
>&2 echo "Format check failed, use 'make lint' for more information.";
|
||||
exit 1;
|
||||
}
|
||||
|
|
|
|||
80
Makefile
80
Makefile
|
|
@ -1,80 +0,0 @@
|
|||
all: debug logs
|
||||
.PHONY: all
|
||||
|
||||
# Builds the debug release inside the Alpine container. For build caching, two
|
||||
# volumes are used named `fej_build-cache` and `fej_registry-cache`. These
|
||||
# images are automatically created for you if they don't exist. If you
|
||||
# encounter any strange build errors, you can try removing this volumes to
|
||||
# start a completely fresh build.
|
||||
debug:
|
||||
@ ./build -m dev -a run build
|
||||
.PHONY: debug
|
||||
|
||||
# Builds the release version. In contrary to the debug version, this build
|
||||
# doesn't use volumes for caching, as this would require the build to happen
|
||||
# during runtime instead of during the building of the image. Instead, it uses
|
||||
# the new `--mount` feature from Buildkit. This does mean that only very recent
|
||||
# Docker engines can build the release version (in my case, at the time of
|
||||
# writing this, 20.10.5).
|
||||
release:
|
||||
@ ./build -m rel
|
||||
.PHONY: release
|
||||
|
||||
# This builds the release version, and pushes all relevant tags to my Docker
|
||||
# Hub repository, namely chewingbever/fej
|
||||
push:
|
||||
@ ./build -m rel -a push
|
||||
.PHONY: push
|
||||
|
||||
# This builds the debug release, and runs it detached. The reason we detach the
|
||||
# container is because Rocket has a tendency to ignore ctlr-c when inside a
|
||||
# container, which gets annoying really fast.
|
||||
run:
|
||||
@ ./build -m dev -a run
|
||||
.PHONY: run
|
||||
|
||||
# As a workaround, we just have a stop command that stops the container.
|
||||
stop:
|
||||
@ docker stop -t 2 fej
|
||||
@ docker stop fej_db
|
||||
.PHONY: stop
|
||||
|
||||
# This attaches to the running container, essentially giving the same result as
|
||||
# just running `cargo run` locally.
|
||||
logs:
|
||||
@ docker logs -f fej
|
||||
.PHONY: logs
|
||||
|
||||
# This just starts up a shell inside the fej container
|
||||
sh:
|
||||
@ docker exec -it fej sh
|
||||
.PHONY: sh
|
||||
|
||||
# Starts a psql session in the database container
|
||||
dbsh:
|
||||
@ docker exec -it fej_db psql -U fej -d fej
|
||||
|
||||
# Builds the debug version, and runs the tests (but doesn't detach).
|
||||
test:
|
||||
@ ./build -m dev -a run -l -- test --no-fail-fast
|
||||
.PHONY: test
|
||||
|
||||
# Runs the cargo code formatter on your code.
|
||||
format:
|
||||
@ cargo fmt
|
||||
.PHONY: format
|
||||
|
||||
# Lints your code. This also gets run in the pre-commit hook, basically
|
||||
# preventing you from committing badly-formatted code.
|
||||
lint:
|
||||
@ cargo fmt -- --check
|
||||
.PHONY: lint
|
||||
|
||||
# This builds the documentation for the project, excluding the documentation.
|
||||
docs:
|
||||
@ cargo doc --no-deps
|
||||
.PHONY: docs
|
||||
|
||||
# This recipe removes all chewingbever/fej images from your system
|
||||
clean-images:
|
||||
@ docker images | grep '^chewingbever/fej' | sed 's/ \+/ /g' | cut -f3 -d' ' | xargs docker rmi
|
||||
108
build
108
build
|
|
@ -1,108 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
image="chewingbever/fej"
|
||||
# Should be either dev or rel
|
||||
mode="dev"
|
||||
action=""
|
||||
attach="--detach"
|
||||
|
||||
while getopts ":i:m:a:l" c; do
|
||||
case $c in
|
||||
i ) image="$OPTARG" ;;
|
||||
m ) mode="$OPTARG" ;;
|
||||
a ) action="$OPTARG" ;;
|
||||
l ) attach="" ;;
|
||||
? ) exit 1 ;;
|
||||
esac
|
||||
done
|
||||
shift $((OPTIND-1))
|
||||
|
||||
# Extract current version from Cargo.toml & get current branch
|
||||
patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
|
||||
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/'`
|
||||
branch=`git rev-parse --abbrev-ref HEAD`
|
||||
|
||||
if [[ "$branch" = "master" ]]; then
|
||||
tags=("$patch_version" "$minor_version" "$major_version" "latest")
|
||||
|
||||
elif [[ "$branch" = "develop" ]]; then
|
||||
tags=("$patch_version-dev" "$minor_version-dev" "$major_version-dev" "dev")
|
||||
|
||||
else
|
||||
tags=("$branch")
|
||||
|
||||
fi
|
||||
|
||||
# First, we build the builder
|
||||
DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile.builder -t "$image-builder:latest" .
|
||||
|
||||
# Run the actual build command
|
||||
if [ "$mode" = "rel" ]; then
|
||||
DOCKER_BUILDKIT=1 docker build -t "$image:$tags" -f docker/Dockerfile.rel .
|
||||
|
||||
elif [[ "$mode" = "dev" ]]; then
|
||||
DOCKER_BUILDKIT=1 docker build -t "$image-dev:$tags" -f docker/Dockerfile.dev .
|
||||
|
||||
else
|
||||
>&2 echo "Invalid mode."
|
||||
exit 1
|
||||
|
||||
fi
|
||||
|
||||
if [[ "$action" = push ]]; then
|
||||
[[ "$branch" =~ ^develop|master$ ]] || {
|
||||
>&2 echo "You can only push from develop or master."
|
||||
exit 2
|
||||
}
|
||||
|
||||
[[ "$mode" = "rel" ]] || {
|
||||
>&2 echo "You can only push release builds."
|
||||
exit 3
|
||||
}
|
||||
|
||||
for tag in "${tags[@]}"; do
|
||||
# Create the tag
|
||||
docker tag "$image:$tags" "$image:$tag"
|
||||
|
||||
# Push the tag
|
||||
docker push "$image:$tag"
|
||||
|
||||
# Remove the tag again, if it's not the main tag
|
||||
[[ "$tag" != "$tags" ]] && docker rmi "$image:$tag"
|
||||
done
|
||||
|
||||
elif [[ "$action" = run ]]; then
|
||||
# Create the network & start the database container
|
||||
docker network create fej
|
||||
docker volume create fej_db-data
|
||||
|
||||
docker run --rm \
|
||||
--detach \
|
||||
--name fej_db \
|
||||
--network fej \
|
||||
-p 5432:5432 \
|
||||
-e "POSTGRES_DB=fej" \
|
||||
-e "POSTGRES_USER=fej" \
|
||||
-e "POSTGRES_PASSWORD=fej" \
|
||||
-v 'fej_db-data:/var/lib/postgresql/data' \
|
||||
postgres:13-alpine
|
||||
|
||||
if [[ "$mode" = "dev" ]]; then
|
||||
# Create caching volumes if needed (they need to be named)
|
||||
docker volume create fej_build-cache
|
||||
docker volume create fej_registry-cache
|
||||
|
||||
flags="-v fej_build-cache:/usr/src/app/target -v fej_registry-cache:/root/.cargo/registry"
|
||||
fi
|
||||
|
||||
docker run $attach $flags \
|
||||
--rm \
|
||||
--interactive \
|
||||
--tty \
|
||||
--publish 8000:8000 \
|
||||
--name fej \
|
||||
--env-file .env.container \
|
||||
--network fej \
|
||||
"$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
|
||||
fi
|
||||
16
fejctl
16
fejctl
|
|
@ -132,14 +132,26 @@ function main() {
|
|||
bin="${2:-server}"
|
||||
|
||||
case $cmd in
|
||||
# Building
|
||||
b | build ) build "$bin" ;;
|
||||
br | build-release ) create_images rel ;;
|
||||
|
||||
# Running
|
||||
r | run ) run "$bin" ;;
|
||||
rr | run-release ) run_release ;;
|
||||
s | stop ) stop ;;
|
||||
|
||||
# Ease of life
|
||||
psql ) docker exec -it fej_db psql -U fej -d fej ;;
|
||||
sh ) docker exec -it fej sh ;;
|
||||
|
||||
# Misc
|
||||
docs ) cargo doc --no-deps ;;
|
||||
format ) cargo fmt ;;
|
||||
l | logs ) logs ;;
|
||||
lint ) cargo fmt -- --check ;;
|
||||
p | push | publish ) publish ;;
|
||||
t | test ) tests ;;
|
||||
s | stop ) stop ;;
|
||||
p | push | publish ) publish ;;
|
||||
* ) >&2 echo "Invalid command."; exit 1 ;;
|
||||
esac
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue