Updating flatcar and app versions.

This commit is contained in:
2026-06-22 16:38:56 -07:00
parent 7df2c07313
commit 619b5ded6f
6 changed files with 19 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
lb: lb:
image: docker.io/caddy:2.10.2-alpine image: docker.io/caddy:2.11.4-alpine
volumes: volumes:
# - /app/lb:/etc/caddy # - /app/lb:/etc/caddy
- ./lb/:/etc/caddy - ./lb/:/etc/caddy

View File

@@ -36,7 +36,7 @@ services:
- lb - lb
ghost_db: ghost_db:
image: mysql:8.0.44@sha256:f37951fc3753a6a22d6c7bf6978c5e5fefcf6f31814d98c582524f98eae52b21 image: mysql:9.7
restart: always restart: always
expose: expose:
- "3306" - "3306"
@@ -59,7 +59,7 @@ services:
- ghost_network - ghost_network
ghost_traffic-analytics: ghost_traffic-analytics:
image: ghost/traffic-analytics:1.0.20@sha256:a72573d89457e778b00e9061422516d2d266d79a72a0fc02005ba6466e391859 image: ghost/traffic-analytics:1.0
restart: always restart: always
expose: expose:
- "3000" - "3000"

View File

@@ -26,7 +26,7 @@ secrets:
services: services:
nassella_lldap_db: nassella_lldap_db:
image: postgres:17.6-trixie image: postgres:18-trixie
environment: environment:
- POSTGRES_DB_FILE=/run/secrets/nassella_lldap_postgres_db - POSTGRES_DB_FILE=/run/secrets/nassella_lldap_postgres_db
- POSTGRES_USER_FILE=/run/secrets/nassella_lldap_postgres_user - POSTGRES_USER_FILE=/run/secrets/nassella_lldap_postgres_user
@@ -34,7 +34,7 @@ services:
shm_size: 128mb shm_size: 128mb
restart: always restart: always
volumes: volumes:
- /nassella/nassella/lldap-var-lib-postgresql-data:/var/lib/postgresql/data - /nassella/nassella/lldap-var-lib-postgresql:/var/lib/postgresql
networks: networks:
- nassella_internal - nassella_internal
healthcheck: healthcheck:
@@ -64,7 +64,7 @@ services:
- nassella_lldap_postgres_user - nassella_lldap_postgres_user
nassella_authelia_db: nassella_authelia_db:
image: postgres:17.6-trixie image: postgres:18-trixie
environment: environment:
- POSTGRES_DB_FILE=/run/secrets/nassella_authelia_postgres_db - POSTGRES_DB_FILE=/run/secrets/nassella_authelia_postgres_db
- POSTGRES_USER_FILE=/run/secrets/nassella_authelia_postgres_user - POSTGRES_USER_FILE=/run/secrets/nassella_authelia_postgres_user
@@ -72,7 +72,7 @@ services:
shm_size: 128mb shm_size: 128mb
restart: always restart: always
volumes: volumes:
- /nassella/nassella/authelia-var-lib-postgresql-data:/var/lib/postgresql/data - /nassella/nassella/authelia-var-lib-postgresql:/var/lib/postgresql
networks: networks:
- nassella_internal - nassella_internal
healthcheck: healthcheck:
@@ -104,13 +104,13 @@ services:
disable: true disable: true
nassella_db: nassella_db:
image: postgres:17.6-trixie image: postgres:18-trixie
env_file: env_file:
- ./nassella/nassella.env - ./nassella/nassella.env
shm_size: 128mb shm_size: 128mb
restart: always restart: always
volumes: volumes:
- /nassella/nassella/var-lib-postgresql-data:/var/lib/postgresql/data - /nassella/nassella/var-lib-postgresql:/var/lib/postgresql
networks: networks:
- nassella_internal - nassella_internal
healthcheck: healthcheck:

View File

@@ -12,13 +12,13 @@ secrets:
services: services:
nextcloud_db: nextcloud_db:
image: postgres:17.6-trixie image: postgres:18-trixie
env_file: env_file:
- ./nextcloud/nextcloud.env - ./nextcloud/nextcloud.env
shm_size: 128mb shm_size: 128mb
restart: always restart: always
volumes: volumes:
- /nassella/nextcloud/var-lib-postgresql-data:/var/lib/postgresql/data - /nassella/nextcloud/var-lib-postgresql:/var/lib/postgresql
networks: networks:
- nextcloud_internal - nextcloud_internal
healthcheck: healthcheck:
@@ -32,7 +32,7 @@ services:
- nextcloud_postgres_password - nextcloud_postgres_password
- nextcloud_postgres_user - nextcloud_postgres_user
nextcloud_redis: nextcloud_redis:
image: redis:8.2.1-bookworm image: redis:8-trixie
env_file: env_file:
- ./nextcloud/nextcloud.env - ./nextcloud/nextcloud.env
command: bash -c 'redis-server --requirepass "$$(cat /run/secrets/nextcloud_redis_password)"' command: bash -c 'redis-server --requirepass "$$(cat /run/secrets/nextcloud_redis_password)"'
@@ -48,7 +48,7 @@ services:
networks: networks:
- nextcloud_internal - nextcloud_internal
nextcloud: nextcloud:
image: nextcloud:31.0.8-apache image: nextcloud:34-apache
depends_on: depends_on:
nextcloud_redis: nextcloud_redis:
condition: service_healthy condition: service_healthy

View File

@@ -96,3 +96,7 @@ create table migrations(
id bigserial primary key, id bigserial primary key,
migration_id integer not null unique, migration_id integer not null unique,
); );
insert into migrations(migration_id) values(0);
insert into migrations(migration_id) values(1);
insert into migrations(migration_id) values(2);

View File

@@ -1486,7 +1486,7 @@ chmod -R 777 /opt/keys")))
("cluster_name" . "nassella") ("cluster_name" . "nassella")
("datacenter" . ,(alist-ref 'digitalocean-region service-config)) ("datacenter" . ,(alist-ref 'digitalocean-region service-config))
;; (source <(curl -sSfL https://stable.release.flatcar-linux.net/amd64-usr/current/version.txt); echo "${FLATCAR_VERSION_ID}") ;; (source <(curl -sSfL https://stable.release.flatcar-linux.net/amd64-usr/current/version.txt); echo "${FLATCAR_VERSION_ID}")
("flatcar_stable_version" . "4593.2.2"))) ("flatcar_stable_version" . "4593.2.3")))
;; remove the newline that generating the ssh key adds ;; remove the newline that generating the ssh key adds
(display "ssh_keys=[\"") (display (string-drop-right ssh-pub-key 1)) (print "\"]")))) (display "ssh_keys=[\"") (display (string-drop-right ssh-pub-key 1)) (print "\"]"))))
(let* ((instance-id (alist-ref "id" (current-params) equal?)) (let* ((instance-id (alist-ref "id" (current-params) equal?))
@@ -1518,7 +1518,6 @@ chmod -R 777 /opt/keys")))
(version . 0)))) (version . 0))))
(thread-start! (thread-start!
(lambda () (lambda ()
;; TODO add a timeout and set status to failed and error if we hit the timeout
(let ((start-time (time->seconds (current-time)))) (let ((start-time (time->seconds (current-time))))
(let loop () (let loop ()
(thread-sleep! 1) (thread-sleep! 1)
@@ -1790,7 +1789,7 @@ chmod -R 777 /opt/keys")))
("cluster_name" . "nassella") ("cluster_name" . "nassella")
("datacenter" . ,(alist-ref 'digitalocean-region service-config)) ("datacenter" . ,(alist-ref 'digitalocean-region service-config))
;; (source <(curl -sSfL https://stable.release.flatcar-linux.net/amd64-usr/current/version.txt); echo "${FLATCAR_VERSION_ID}") ;; (source <(curl -sSfL https://stable.release.flatcar-linux.net/amd64-usr/current/version.txt); echo "${FLATCAR_VERSION_ID}")
("Flatcar_stable_version" . "4593.2.2"))) ("Flatcar_stable_version" . "4593.2.3")))
;; remove the newline that generating the ssh key adds ;; remove the newline that generating the ssh key adds
(display "ssh_keys=[\"") (display (string-drop-right ssh-pub-key 1)) (print "\"]"))) (display "ssh_keys=[\"") (display (string-drop-right ssh-pub-key 1)) (print "\"]")))
;; TODO need a new table to track destroying? ;; TODO need a new table to track destroying?