From 94647f411620b2deb7193ebebbf7b6b7bab5ffb6 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 28 Aug 2024 02:53:38 +0900 Subject: migrate docker compose to v2 --- Makefile | 2 +- Makefile.prod | 2 +- compose.local.yaml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ compose.prod.yaml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ docker-compose.local.yml | 51 ------------------------------------------------ docker-compose.prod.yml | 51 ------------------------------------------------ 6 files changed, 104 insertions(+), 104 deletions(-) create mode 100644 compose.local.yaml create mode 100644 compose.prod.yaml delete mode 100644 docker-compose.local.yml delete mode 100644 docker-compose.prod.yml diff --git a/Makefile b/Makefile index db19a71..eebd03c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DOCKER_COMPOSE := docker compose -f docker-compose.local.yml --env-file .env.local +DOCKER_COMPOSE := docker compose -f compose.local.yaml --env-file .env.local .PHONY: up up: diff --git a/Makefile.prod b/Makefile.prod index 1bfbfca..6b68e3e 100644 --- a/Makefile.prod +++ b/Makefile.prod @@ -1,4 +1,4 @@ -DOCKER_COMPOSE := docker-compose -f docker-compose.prod.yml --env-file .env.prod +DOCKER_COMPOSE := docker compose -f compose.prod.yaml --env-file .env.prod .PHONY: build build: build-assets diff --git a/compose.local.yaml b/compose.local.yaml new file mode 100644 index 0000000..c442761 --- /dev/null +++ b/compose.local.yaml @@ -0,0 +1,51 @@ +version: '3' + +services: + albatross-app: + build: + context: ./services/app + args: + ALBATROSS_BASE_PATH: $ALBATROSS_BASE_PATH + ports: + - '127.0.0.1:8001:80' + volumes: + - './services/app/public:/var/www/html/public' + - './services/app/src:/var/www/html/src' + - './services/app/templates:/var/www/html/templates' + - './services/app/php.local.ini:/usr/local/etc/php/php.ini' + - 'session-data:/tmp/session' + env_file: .env.local + restart: always + + albatross-jobworker: + build: + context: ./services/app + volumes: + - './services/app/bin:/var/www/html/bin' + - './services/app/src:/var/www/html/src' + - './services/app/php.local.ini:/usr/local/etc/php/php.ini' + entrypoint: 'php bin/jobworker' + env_file: .env.local + restart: always + + albatross-db: + image: postgres:16.0 + expose: + - 5432 + volumes: + - 'db-data:/var/lib/postgresql/data' + environment: + POSTGRES_PASSWORD: $ALBATROSS_DB_PASSWORD + restart: always + + albatross-sandbox-exec: + build: + context: ./services/sandbox-exec + expose: + - 8888 + env_file: .env.local + restart: always + +volumes: + db-data: + session-data: diff --git a/compose.prod.yaml b/compose.prod.yaml new file mode 100644 index 0000000..6865d02 --- /dev/null +++ b/compose.prod.yaml @@ -0,0 +1,51 @@ +version: '3' + +services: + albatross-app: + build: + context: ./services/app + args: + ALBATROSS_BASE_PATH: $ALBATROSS_BASE_PATH + ports: + - '127.0.0.1:8001:80' + volumes: + - './services/app/public:/var/www/html/public' + - './services/app/src:/var/www/html/src' + - './services/app/templates:/var/www/html/templates' + - './services/app/php.prod.ini:/usr/local/etc/php/conf.d/php.ini' + - 'session-data:/tmp/session' + env_file: .env.prod + restart: always + + albatross-jobworker: + build: + context: ./services/app + volumes: + - './services/app/bin:/var/www/html/bin' + - './services/app/src:/var/www/html/src' + - './services/app/php.prod.ini:/usr/local/etc/php/conf.d/php.ini' + entrypoint: 'php bin/jobworker' + env_file: .env.prod + restart: always + + albatross-db: + image: postgres:16.0 + expose: + - 5432 + volumes: + - 'db-data:/var/lib/postgresql/data' + environment: + POSTGRES_PASSWORD: $ALBATROSS_DB_PASSWORD + restart: always + + albatross-sandbox-exec: + build: + context: ./services/sandbox-exec + expose: + - 8888 + env_file: .env.prod + restart: always + +volumes: + db-data: + session-data: diff --git a/docker-compose.local.yml b/docker-compose.local.yml deleted file mode 100644 index c442761..0000000 --- a/docker-compose.local.yml +++ /dev/null @@ -1,51 +0,0 @@ -version: '3' - -services: - albatross-app: - build: - context: ./services/app - args: - ALBATROSS_BASE_PATH: $ALBATROSS_BASE_PATH - ports: - - '127.0.0.1:8001:80' - volumes: - - './services/app/public:/var/www/html/public' - - './services/app/src:/var/www/html/src' - - './services/app/templates:/var/www/html/templates' - - './services/app/php.local.ini:/usr/local/etc/php/php.ini' - - 'session-data:/tmp/session' - env_file: .env.local - restart: always - - albatross-jobworker: - build: - context: ./services/app - volumes: - - './services/app/bin:/var/www/html/bin' - - './services/app/src:/var/www/html/src' - - './services/app/php.local.ini:/usr/local/etc/php/php.ini' - entrypoint: 'php bin/jobworker' - env_file: .env.local - restart: always - - albatross-db: - image: postgres:16.0 - expose: - - 5432 - volumes: - - 'db-data:/var/lib/postgresql/data' - environment: - POSTGRES_PASSWORD: $ALBATROSS_DB_PASSWORD - restart: always - - albatross-sandbox-exec: - build: - context: ./services/sandbox-exec - expose: - - 8888 - env_file: .env.local - restart: always - -volumes: - db-data: - session-data: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml deleted file mode 100644 index 6865d02..0000000 --- a/docker-compose.prod.yml +++ /dev/null @@ -1,51 +0,0 @@ -version: '3' - -services: - albatross-app: - build: - context: ./services/app - args: - ALBATROSS_BASE_PATH: $ALBATROSS_BASE_PATH - ports: - - '127.0.0.1:8001:80' - volumes: - - './services/app/public:/var/www/html/public' - - './services/app/src:/var/www/html/src' - - './services/app/templates:/var/www/html/templates' - - './services/app/php.prod.ini:/usr/local/etc/php/conf.d/php.ini' - - 'session-data:/tmp/session' - env_file: .env.prod - restart: always - - albatross-jobworker: - build: - context: ./services/app - volumes: - - './services/app/bin:/var/www/html/bin' - - './services/app/src:/var/www/html/src' - - './services/app/php.prod.ini:/usr/local/etc/php/conf.d/php.ini' - entrypoint: 'php bin/jobworker' - env_file: .env.prod - restart: always - - albatross-db: - image: postgres:16.0 - expose: - - 5432 - volumes: - - 'db-data:/var/lib/postgresql/data' - environment: - POSTGRES_PASSWORD: $ALBATROSS_DB_PASSWORD - restart: always - - albatross-sandbox-exec: - build: - context: ./services/sandbox-exec - expose: - - 8888 - env_file: .env.prod - restart: always - -volumes: - db-data: - session-data: -- cgit v1.2.3-70-g09d2