adyxax/www
1
0
Fork 0
Code Issues Activity

Reworked the building of the website in a container with buildah

Browse source
This commit is contained in:
Julien Dessaux 2022-09-06 00:40:46 +02:00
parent ae86aba801
commit a300c14972
Signed by: adyxax
GPG key ID: F92E51B86E07177E
2 changed files with 39 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -10,6 +10,10 @@ build: ## make build # builds an optimized version of the website in $(DESTDIR)
cp public/search/index.html search/
(cd search && CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' ./search.go)
.PHONY: buildah
buildah: ## make buildah # builds the container images
deploy/build-image.sh
.PHONY: clean
clean: ## make clean # removed all $(DESTDIR) contents
@echo "----- Cleaning old build -----"

61
deploy/build-image.sh
View file

@ -1,55 +1,64 @@
#!/usr/bin/env bash
set -eu
set -euo pipefail
(cd .. && make clean build)
ret=0; output=$(buildah images adyxax/alpine &>/dev/null) || ret=$?
if [ $ret != 0 ]; then
ret=0; buildah images adyxax/alpine &>/dev/null || ret=$?
if [[ "${ret}" != 0 ]]; then
buildah rmi --all
ALPINE_LATEST=$(curl --silent https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/ |
perl -lane '$latest = $1 if $_ =~ /^<a href="(alpine-minirootfs-\d+\.\d+\.\d+-x86_64\.tar\.gz)">/; END {print $latest}'
)
if [ ! -e "./${ALPINE_LATEST}" ]; then
echo "Fetching ${ALPINE_LATEST}..."
curl --silent https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/${ALPINE_LATEST} \
--output ./${ALPINE_LATEST}
curl --silent "https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/${ALPINE_LATEST}" \
--output "./${ALPINE_LATEST}"
fi
ctr=$(buildah from scratch)
buildah add $ctr ${ALPINE_LATEST} /
buildah run $ctr /bin/sh -c 'apk add --no-cache pcre sqlite-libs'
buildah commit $ctr adyxax/alpine
else
ctr=$(buildah from adyxax/alpine)
#buildah run $ctr /bin/sh -c 'apk upgrade --no-cache'
buildah add "${ctr}" "${ALPINE_LATEST}" /
buildah run "${ctr}" /bin/sh -c 'apk upgrade --no-cache'
buildah run "${ctr}" /bin/sh -c 'apk add --no-cache pcre sqlite-libs'
buildah commit "${ctr}" adyxax/alpine
buildah rm "${ctr}"
fi
ret=0; buildah images adyxax/hugo &>/dev/null || ret=$?
if [[ "${ret}" != 0 ]]; then
hugo=$(buildah from adyxax/alpine)
buildah run "${hugo}" /bin/sh -c 'apk add --no-cache go git hugo make'
buildah commit "${hugo}" adyxax/hugo
else
hugo=$(buildah from adyxax/hugo)
fi
buildah run -v "${PWD}":/www "${hugo}" -- sh -c 'cd /www; make build'
buildah rm "${hugo}"
ret=0; buildah images adyxax/nginx &>/dev/null || ret=$?
if [ $ret != 0 ]; then
if [[ "${ret}" != 0 ]]; then
nginx=$(buildah from adyxax/alpine)
buildah run $nginx /bin/sh -c 'apk add --no-cache nginx'
buildah commit $nginx adyxax/nginx
buildah run "${nginx}" /bin/sh -c 'apk add --no-cache nginx'
buildah commit "${nginx}" adyxax/nginx
else
nginx=$(buildah from adyxax/nginx)
#buildah run $nginx /bin/sh -c 'apk upgrade --no-cache'
fi
buildah copy $nginx nginx.conf headers_secure.conf headers_static.conf /etc/nginx/
(cd deploy && buildah copy "${nginx}" nginx.conf headers_secure.conf headers_static.conf /etc/nginx/)
buildah config \
--author 'Julien Dessaux' \
--cmd nginx \
--port 80 \
$nginx
buildah copy $nginx ../public /var/www/www.adyxax.org
"${nginx}"
buildah copy "${nginx}" public /var/www/www.adyxax.org
buildah commit $nginx adyxax/www
buildah rm $nginx
buildah commit "${nginx}" adyxax/www
buildah rm "${nginx}"
ctr=$(buildah from scratch)
buildah copy $ctr ../search/search /
buildah copy "${ctr}" search/search /
buildah config \
--author 'Julien Dessaux' \
--cmd /search \
--port 8080 \
$ctr
buildah commit $ctr adyxax/www-search
buildah rm $ctr
"${ctr}"
buildah commit "${ctr}" adyxax/www-search
buildah rm "${ctr}"