diff --git a/Makefile b/Makefile index 21f3bb79b..0bf9578a5 100644 --- a/Makefile +++ b/Makefile @@ -103,22 +103,22 @@ pull: - docker pull newsblur/newsblur_monitor build_web: - - docker image build . --platform linux/amd64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3 + - docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3 build_node: - - docker image build . --platform linux/amd64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node + - docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node build_monitor: - - docker image build . --platform linux/amd64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor + - docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor build_deploy: - - docker image build . --platform linux/amd64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy + - docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy build: build_web build_node build_monitor build_deploy -push_web: build_web - - docker push newsblur/newsblur_python3 -push_node: build_node - - docker push newsblur/newsblur_node -push_monitor: build_monitor - - docker push newsblur/newsblur_monitor -push_deploy: build_deploy - - docker push newsblur/newsblur_deploy +push_web: + - docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3 +push_node: + - docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node +push_monitor: + - docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor +push_deploy: + - docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy push_images: push_web push_node push_monitor push_deploy push: build push_images diff --git a/ansible/playbooks/deploy_app.yml b/ansible/playbooks/deploy_app.yml index 98ce0573a..07f5c60a9 100644 --- a/ansible/playbooks/deploy_app.yml +++ b/ansible/playbooks/deploy_app.yml @@ -65,7 +65,7 @@ git: repo: https://github.com/samuelclay/NewsBlur.git dest: /srv/newsblur/ - version: pipeline + version: master register: pulled tags: - static diff --git a/ansible/roles/node/tasks/main.yml b/ansible/roles/node/tasks/main.yml index 39d344db9..6560df6cf 100644 --- a/ansible/roles/node/tasks/main.yml +++ b/ansible/roles/node/tasks/main.yml @@ -110,7 +110,7 @@ - /srv/newsblur/node:/srv/node with_items: - container_name: imageproxy - image: willnorris/imageproxy + image: ghcr.io/willnorris/imageproxy ports: 8088:8080 target_host: node-images when: item.target_host in inventory_hostname diff --git a/docker-compose.yml b/docker-compose.yml index aa98492d0..144aea2ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: imageproxy: container_name: imageproxy - image: willnorris/imageproxy:latest + image: ghcr.io/willnorris/imageproxy:latest user: "${CURRENT_UID}:${CURRENT_GID}" entrypoint: /app/imageproxy -addr 0.0.0.0:8088 -cache /tmp/imageproxy -verbose restart: unless-stopped diff --git a/docker/monitor/Dockerfile b/docker/monitor/Dockerfile index ad8709a13..3aad1bd48 100644 --- a/docker/monitor/Dockerfile +++ b/docker/monitor/Dockerfile @@ -11,7 +11,6 @@ RUN set -ex \ && buildDeps=' \ patch \ gfortran \ - lib32ncurses5-dev \ libblas-dev \ libffi-dev \ libjpeg-dev \ diff --git a/templates/maintenance_off.html b/templates/maintenance_off.html index 5319de552..ee23ea51a 100644 --- a/templates/maintenance_off.html +++ b/templates/maintenance_off.html @@ -85,8 +85,7 @@

NewsBlur is in maintenance mode

-

Performing a very quick, one minute downtime maintenance. We're moving the Redis database servers off older infrastructure and onto a Docker-based mesh. This has to be done FOUR TIMES for the four Redis databases (user, story, sessions, and pubsub).

-

I'm only doing one a day, so if you're lucky enough to catch this message, know that it'll be gone within the minute.

+

This is a unique maintenance mode. This is only for deploying the new front-end asset packager we're switching to (here's the merge on GitHub). It's a bit messy though, since there is a brief moment when switching from the old to the new that can be in a buggy, liminal state of using part of one system and part of another. So to avoid that I'm just going to throw up a maintenance page for a quick minute.

To pass the time, check out what's popular on MLTSHP.