ehlxr/pleroma-docker
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement smart build caches

Browse Source
This commit is contained in:
sn0w 2019-01-10 18:24:29 +01:00
parent a8a1a6ed35
commit a02f0a4d67
No known key found for this signature in database
GPG Key ID: DDEDFB9D3FA15727
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -53,8 +53,8 @@ WORKDIR /home/pleroma/pleroma
# used version/branch/tag/commitish/... which originates in the script. # used version/branch/tag/commitish/... which originates in the script.
# If the host doesn't have the required tool for "smart version detection" # If the host doesn't have the required tool for "smart version detection"
# we'll just use the current timestamp here which forces a rebuild every time. # we'll just use the current timestamp here which forces a rebuild every time.
ARG __BUST_CACHE ARG __CACHE_TAG
ENV __BUST_CACHE $__BUST_CACHE ENV __CACHE_TAG $__CACHE_TAG
# Fetch changes, checkout # Fetch changes, checkout
ARG PLEROMA_VERSION ARG PLEROMA_VERSION

36
pleroma
View File

@ -13,6 +13,7 @@ set -o pipefail
readonly GITLAB_URI="https://git.pleroma.social" readonly GITLAB_URI="https://git.pleroma.social"
readonly PREFIX_API="api/v4/projects/pleroma%2Fpleroma/repository" readonly PREFIX_API="api/v4/projects/pleroma%2Fpleroma/repository"
readonly ENDPOINT_REPO="pleroma/pleroma.git"
readonly ENDPOINT_FILE="pleroma/pleroma/raw" readonly ENDPOINT_FILE="pleroma/pleroma/raw"
readonly ENDPOINT_LIST="pleroma/pleroma/files" readonly ENDPOINT_LIST="pleroma/pleroma/files"
readonly ENDPOINT_TAG="$PREFIX_API/tags" readonly ENDPOINT_TAG="$PREFIX_API/tags"
@ -110,7 +111,40 @@ request_file_content() { # $1: source
######################################################### #########################################################
action__build() { action__build() {
docker_compose build --build-arg __BUST_CACHE="$(date +%s)" server local cacheTag=""
# Alternative 1: Get tags or branches from git (if installed)
if [[ -z "$cacheTag" ]] && has_command git; then
set +o pipefail
local resolvedHash
resolvedHash="$(git ls-remote $GITLAB_URI/$ENDPOINT_REPO | grep "/$PLEROMA_VERSION" | awk '{ print $1 }')"
set -o pipefail
if [[ -n "$resolvedHash" ]]; then
cacheTag="$resolvedHash"
fi
fi
# Alternative 2: Current time with date or awk
if [[ -z "$cacheTag" ]] && has_command date; then
cacheTag="$(date '+%s')"
fi
if [[ -z "$cacheTag" ]] && has_command awk; then
cacheTag="$(awk 'BEGIN { srand(); print srand() }')"
fi
# Last resort: Constant value, user will need to run `docker system prune`
if [[ -z "$cacheTag" ]]; then
echo ""
echo "Warning: Cannot set a reliably unique cache tag."
echo " You may be running outdated code!"
echo ""
cacheTag="broken-host-env"
fi
docker_compose build --build-arg __CACHE_TAG="$cacheTag" server
} }
action__dump() { action__dump() {