diff --git a/bash/build_base.sh b/bash/build_base.sh index de5148f..7aa3f79 100755 --- a/bash/build_base.sh +++ b/bash/build_base.sh @@ -1,22 +1,19 @@ # torsearch-app is built from this base export APP_FRANKENPHP_TAG=php8.4 -#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" . -docker build -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" . -docker push code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -docker push code.caldwell.digital/home/torsearch-base:latest +docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" . +docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} +docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:latest # torsearch-worker & torsearch-scheduler are built from this base export WORKER_FRANKENPHP_TAG=php8.4-alpine -#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" . -docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" . -docker push code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -docker push code.caldwell.digital/home/torsearch-base-worker:latest +docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" . +docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} +docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:latest # torsearch-worker-supervisord export ALPINE_VERSION=3.22 -#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" . -docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" . -docker push code.caldwell.digital/home/torsearch-base-worker-supervisord:latest +docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" . +docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker-supervisord:latest diff --git a/docker/Dockerfile.base.worker b/docker/Dockerfile.base.worker index 46ee82c..f250354 100644 --- a/docker/Dockerfile.base.worker +++ b/docker/Dockerfile.base.worker @@ -16,11 +16,13 @@ RUN apk add --no-cache \ php84-fileinfo \ php84-fpm \ php84-gd \ + php84-intl \ php84-mbstring \ php84-mysqli \ php84-opcache \ php84-openssl \ php84-pdo_mysql \ + php84-session \ php84-tokenizer \ php84-xml \ supervisor