mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
fix autoconf/cors, fix docker/wordpress, fix wrong image name for k8s/scheduler and upgrade tests instances for swarm/k8s
This commit is contained in:
parent
5e598e90c9
commit
671db37f73
7 changed files with 30 additions and 10 deletions
|
@ -21,7 +21,7 @@ services:
|
|||
- bunkerweb.REMOTE_PHP_PATH=/app
|
||||
|
||||
myapp2:
|
||||
image: php:fpm-alpine
|
||||
image: php:fpm
|
||||
networks:
|
||||
bw-services:
|
||||
aliases:
|
||||
|
@ -38,7 +38,7 @@ services:
|
|||
- bunkerweb.REMOTE_PHP_PATH=/app
|
||||
|
||||
myapp3:
|
||||
image: php:fpm-alpine
|
||||
image: php:fpm
|
||||
networks:
|
||||
bw-services:
|
||||
aliases:
|
||||
|
|
|
@ -51,9 +51,9 @@ services:
|
|||
- wp-data:/var/www/html
|
||||
environment:
|
||||
- WORDPRESS_DB_HOST=mydb
|
||||
- WORDPRESS_DB_NAME=${WORDPRESS_DATABASE:-wp}
|
||||
- WORDPRESS_DB_USER=${WORDPRESS_USER:-user}
|
||||
- WORDPRESS_DB_PASSWORD=${WORDPRESS_PASSWORD:-secret} # set a stronger password in a .env file (must match MYSQL_PASSWORD)
|
||||
- WORDPRESS_DB_NAME=wp
|
||||
- WORDPRESS_DB_USER=user
|
||||
- WORDPRESS_DB_PASSWORD=db-user-pwd # set a stronger password in a .env file (must match MYSQL_PASSWORD)
|
||||
- WORDPRESS_TABLE_PREFIX=prefix_ # best practice : replace with a random prefix
|
||||
networks:
|
||||
- bw-services
|
||||
|
|
|
@ -77,6 +77,10 @@ spec:
|
|||
value: ""
|
||||
- name: MULTISITE
|
||||
value: "yes"
|
||||
- name: USE_REDIS
|
||||
value: "yes"
|
||||
- name: REDIS_HOST
|
||||
value: "svc-bunkerweb-redis"
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
|
@ -142,8 +146,8 @@ spec:
|
|||
app: bunkerweb-scheduler
|
||||
spec:
|
||||
containers:
|
||||
- name: bunkerweb-controller
|
||||
image: bunkerity/bunkerweb-autoconf:1.4.6
|
||||
- name: bunkerweb-scheduler
|
||||
image: bunkerity/bunkerweb-scheduler:1.4.6
|
||||
imagePullPolicy: Always
|
||||
env:
|
||||
- name: KUBERNETES_MODE
|
||||
|
|
|
@ -40,6 +40,10 @@ services:
|
|||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
deploy:
|
||||
placement:
|
||||
constraints:
|
||||
- "node.role == worker"
|
||||
|
||||
bw-docker:
|
||||
image: tecnativa/docker-socket-proxy
|
||||
|
@ -67,6 +71,10 @@ services:
|
|||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
deploy:
|
||||
placement:
|
||||
constraints:
|
||||
- "node.role == worker"
|
||||
|
||||
bw-db:
|
||||
image: mariadb:10.10
|
||||
|
@ -79,11 +87,19 @@ services:
|
|||
- bw-data:/var/lib/mysql
|
||||
networks:
|
||||
- bw-docker
|
||||
deploy:
|
||||
placement:
|
||||
constraints:
|
||||
- "node.role == worker"
|
||||
|
||||
bw-redis:
|
||||
image: redis:7-alpine
|
||||
networks:
|
||||
- bw-universe
|
||||
deploy:
|
||||
placement:
|
||||
constraints:
|
||||
- "node.role == worker"
|
||||
|
||||
volumes:
|
||||
bw-data:
|
||||
|
|
|
@ -71,7 +71,7 @@ class SwarmTest(Test):
|
|||
i += 1
|
||||
if not healthy:
|
||||
proc = run(
|
||||
"docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler ; docker service logs bunkerweb_bw-db",
|
||||
"docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler ; docker service logs bunkerweb_bw-db ; docker service logs bunkerweb_bw-redis ; docker stack ps --no-trunc bunkerweb",
|
||||
cwd="/tmp/swarm",
|
||||
shell=True,
|
||||
capture_output=True,
|
||||
|
|
|
@ -20,7 +20,7 @@ resource "scaleway_k8s_cluster" "cluster" {
|
|||
resource "scaleway_k8s_pool" "pool" {
|
||||
cluster_id = scaleway_k8s_cluster.cluster.id
|
||||
name = "bw_k8s"
|
||||
node_type = "DEV1-M"
|
||||
node_type = "DEV1-L"
|
||||
size = 3
|
||||
wait_for_pool_ready = true
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ resource "scaleway_instance_server" "instances" {
|
|||
count = 3
|
||||
depends_on = [scaleway_account_ssh_key.ssh_key]
|
||||
name = "cicd_bw_swarm_${count.index}"
|
||||
type = "DEV1-M"
|
||||
type = "DEV1-L"
|
||||
image = "debian_bullseye"
|
||||
ip_id = var.swarm_ips_id[count.index]
|
||||
private_network {
|
||||
|
|
Loading…
Reference in a new issue