mirror of
https://github.com/ClusterCockpit/cc-docker.git
synced 2024-12-26 20:09:06 +01:00
Change to single setup.
This commit is contained in:
parent
4436f76a63
commit
f1bc23d11f
3
.env
3
.env
@ -1,10 +1,11 @@
|
||||
DATADIR=./data
|
||||
CLUSTERCOCKPIT_BRANCH=develop
|
||||
|
||||
########################################################################
|
||||
# APP
|
||||
########################################################################
|
||||
APP_CLUSTERCOCKPIT_INIT=true
|
||||
APP_ENVIRONMENT=prod
|
||||
APP_ENVIRONMENT=dev
|
||||
|
||||
########################################################################
|
||||
# PHP
|
||||
|
@ -9,6 +9,7 @@ if [ -d symfony ]; then
|
||||
rm -rf symfony
|
||||
sudo rm -rf job-archive
|
||||
rm -rf influxdb/data/*
|
||||
rm -rf sqldata/*
|
||||
echo "done."
|
||||
else
|
||||
echo "Aborting ..."
|
||||
|
File diff suppressed because one or more lines are too long
@ -1,47 +0,0 @@
|
||||
services:
|
||||
db:
|
||||
volumes:
|
||||
- ${DATADIR}/sqldata:/var/lib/mysql
|
||||
|
||||
influxdb:
|
||||
container_name: cc-influxdb
|
||||
image: influxdb
|
||||
command: ["--reporting-disabled"]
|
||||
environment:
|
||||
DOCKER_INFLUXDB_INIT_MODE: setup
|
||||
DOCKER_INFLUXDB_INIT_USERNAME: symfony
|
||||
DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_PASSWORD}
|
||||
DOCKER_INFLUXDB_INIT_ORG: ClusterCockpit
|
||||
DOCKER_INFLUXDB_INIT_BUCKET: ClusterCockpit
|
||||
DOCKER_INFLUXDB_INIT_RETENTION: 100w
|
||||
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
|
||||
ports:
|
||||
- "127.0.0.1:${INFLUXDB_PORT}:8086"
|
||||
volumes:
|
||||
- ${DATADIR}/influxdb/data:/var/lib/influxdb2
|
||||
- ${DATADIR}/influxdb/config:/etc/influxdb2
|
||||
|
||||
openldap:
|
||||
container_name: cc-ldap
|
||||
image: osixia/openldap:1.5.0
|
||||
command: --copy-service --loglevel debug
|
||||
environment:
|
||||
- LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
|
||||
- LDAP_ORGANISATION=${LDAP_ORGANISATION}
|
||||
- LDAP_DOMAIN=${LDAP_DOMAIN}
|
||||
volumes:
|
||||
- ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
|
||||
ports:
|
||||
- "127.0.0.1:389:389"
|
||||
- "127.0.0.1:636:636"
|
||||
|
||||
phpmyadmin:
|
||||
container_name: cc-phpmyadmin
|
||||
image: phpmyadmin
|
||||
environment:
|
||||
- PMA_HOST=cc-db
|
||||
- PMA_USER=root
|
||||
- PMA_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||
ports:
|
||||
- "127.0.0.1:${PHPMYADMIN_PORT}:80"
|
||||
restart: always
|
@ -1,71 +1,116 @@
|
||||
services:
|
||||
db:
|
||||
container_name: cc-db
|
||||
image: mysql:8.0.22
|
||||
command: ["--default-authentication-plugin=mysql_native_password"]
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
||||
MYSQL_USER: ${MYSQL_USER}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
volumes:
|
||||
- ${DATADIR}/sql-init:/docker-entrypoint-initdb.d
|
||||
cap_add:
|
||||
- SYS_NICE
|
||||
db:
|
||||
container_name: cc-db
|
||||
image: mysql:8.0.22
|
||||
command: ["--default-authentication-plugin=mysql_native_password"]
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
||||
MYSQL_USER: ${MYSQL_USER}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
volumes:
|
||||
- ${DATADIR}/sql-init:/docker-entrypoint-initdb.d
|
||||
- ${DATADIR}/sqldata:/var/lib/mysql
|
||||
cap_add:
|
||||
- SYS_NICE
|
||||
|
||||
redis:
|
||||
container_name: cc-redis
|
||||
image: redis
|
||||
command: [
|
||||
"redis-server",
|
||||
"--save", "",
|
||||
"--maxmemory", "1gb",
|
||||
"--maxmemory-policy", "allkeys-lru"]
|
||||
influxdb:
|
||||
container_name: cc-influxdb
|
||||
image: influxdb
|
||||
command: ["--reporting-disabled"]
|
||||
environment:
|
||||
DOCKER_INFLUXDB_INIT_MODE: setup
|
||||
DOCKER_INFLUXDB_INIT_USERNAME: symfony
|
||||
DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_PASSWORD}
|
||||
DOCKER_INFLUXDB_INIT_ORG: ClusterCockpit
|
||||
DOCKER_INFLUXDB_INIT_BUCKET: ClusterCockpit
|
||||
DOCKER_INFLUXDB_INIT_RETENTION: 100w
|
||||
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
|
||||
ports:
|
||||
- "127.0.0.1:${INFLUXDB_PORT}:8086"
|
||||
volumes:
|
||||
- ${DATADIR}/influxdb/data:/var/lib/influxdb2
|
||||
- ${DATADIR}/influxdb/config:/etc/influxdb2
|
||||
|
||||
php:
|
||||
container_name: cc-php
|
||||
build:
|
||||
context: ./php-fpm
|
||||
args:
|
||||
PHP_XDEBUG_INIT: ${PHP_XDEBUG_INIT}
|
||||
PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE}
|
||||
PHP_XDEBUG_CLIENT_PORT: ${PHP_XDEBUG_CLIENT_PORT}
|
||||
PHP_XDEBUG_CLIENT_HOST: ${PHP_XDEBUG_CLIENT_HOST}
|
||||
SYMFONY_CLI_VERSION: 4.23.2
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
||||
MYSQL_USER: ${MYSQL_USER}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
LDAP_PASSWORD: ${LDAP_ADMIN_PASSWORD}
|
||||
INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD}
|
||||
INFLUXDB_PORT: ${INFLUXDB_PORT}
|
||||
INFLUXDB_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
|
||||
APP_ENVIRONMENT: ${APP_ENVIRONMENT}
|
||||
environment:
|
||||
- APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT}
|
||||
volumes:
|
||||
- ${DATADIR}/symfony:/var/www/symfony:cached
|
||||
- ${DATADIR}/job-archive:/var/lib/job-archive:cached
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
openldap:
|
||||
container_name: cc-ldap
|
||||
image: osixia/openldap:1.5.0
|
||||
command: --copy-service --loglevel debug
|
||||
environment:
|
||||
- LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
|
||||
- LDAP_ORGANISATION=${LDAP_ORGANISATION}
|
||||
- LDAP_DOMAIN=${LDAP_DOMAIN}
|
||||
volumes:
|
||||
- ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
|
||||
ports:
|
||||
- "127.0.0.1:389:389"
|
||||
- "127.0.0.1:636:636"
|
||||
|
||||
nginx:
|
||||
container_name: cc-nginx
|
||||
build:
|
||||
context: ./nginx
|
||||
args:
|
||||
NGINX_SYMFONY_SERVER_NAME: ${NGINX_SYMFONY_SERVER_NAME}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD}
|
||||
APP_ENVIRONMENT: ${APP_ENVIRONMENT}
|
||||
ports:
|
||||
- "127.0.0.1:${NGINX_PORT}:80"
|
||||
depends_on:
|
||||
- php
|
||||
environment:
|
||||
- NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/conf.d
|
||||
- NGINX_ENVSUBST_TEMPLATE_DIR=/etc/nginx/templates
|
||||
- NGINX_ENVSUBST_TEMPLATE_SUFFIX=.template
|
||||
- NGINX_SYMFONY_SERVER_NAME=${NGINX_SYMFONY_SERVER_NAME}
|
||||
volumes:
|
||||
- ${DATADIR}/symfony:/var/www/symfony:cached
|
||||
redis:
|
||||
container_name: cc-redis
|
||||
image: redis
|
||||
command: [
|
||||
"redis-server",
|
||||
"--save", "",
|
||||
"--maxmemory", "1gb",
|
||||
"--maxmemory-policy", "allkeys-lru"]
|
||||
|
||||
php:
|
||||
container_name: cc-php
|
||||
build:
|
||||
context: ./php-fpm
|
||||
args:
|
||||
PHP_XDEBUG_INIT: ${PHP_XDEBUG_INIT}
|
||||
PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE}
|
||||
PHP_XDEBUG_CLIENT_PORT: ${PHP_XDEBUG_CLIENT_PORT}
|
||||
PHP_XDEBUG_CLIENT_HOST: ${PHP_XDEBUG_CLIENT_HOST}
|
||||
SYMFONY_CLI_VERSION: 4.23.2
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
||||
MYSQL_USER: ${MYSQL_USER}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
LDAP_PASSWORD: ${LDAP_ADMIN_PASSWORD}
|
||||
INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD}
|
||||
INFLUXDB_PORT: ${INFLUXDB_PORT}
|
||||
INFLUXDB_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
|
||||
APP_ENVIRONMENT: ${APP_ENVIRONMENT}
|
||||
environment:
|
||||
- APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT}
|
||||
- CLUSTERCOCKPIT_BRANCH=${CLUSTERCOCKPIT_BRANCH}
|
||||
volumes:
|
||||
- ${DATADIR}/symfony:/var/www/symfony:cached
|
||||
- ${DATADIR}/job-archive:/var/lib/job-archive:cached
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
|
||||
nginx:
|
||||
container_name: cc-nginx
|
||||
build:
|
||||
context: ./nginx
|
||||
args:
|
||||
NGINX_SYMFONY_SERVER_NAME: ${NGINX_SYMFONY_SERVER_NAME}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD}
|
||||
APP_ENVIRONMENT: ${APP_ENVIRONMENT}
|
||||
ports:
|
||||
- "127.0.0.1:${NGINX_PORT}:80"
|
||||
depends_on:
|
||||
- php
|
||||
environment:
|
||||
- NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/conf.d
|
||||
- NGINX_ENVSUBST_TEMPLATE_DIR=/etc/nginx/templates
|
||||
- NGINX_ENVSUBST_TEMPLATE_SUFFIX=.template
|
||||
- NGINX_SYMFONY_SERVER_NAME=${NGINX_SYMFONY_SERVER_NAME}
|
||||
volumes:
|
||||
- ${DATADIR}/symfony:/var/www/symfony:cached
|
||||
|
||||
phpmyadmin:
|
||||
container_name: cc-phpmyadmin
|
||||
image: phpmyadmin
|
||||
environment:
|
||||
- PMA_HOST=cc-db
|
||||
- PMA_USER=root
|
||||
- PMA_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||
ports:
|
||||
- "127.0.0.1:${PHPMYADMIN_PORT}:80"
|
||||
restart: always
|
||||
|
@ -1,13 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if [ "$APP_CLUSTERCOCKPIT_INIT" = true ]; then
|
||||
|
||||
|
||||
rm -rf /var/www/symfony/* /var/www/symfony/.??*
|
||||
git clone https://github.com/ClusterCockpit/ClusterCockpit .
|
||||
git clone -b $CLUSTERCOCKPIT_BRANCH https://github.com/ClusterCockpit/ClusterCockpit .
|
||||
|
||||
if [ "$APP_ENV" = dev ]; then
|
||||
git checkout develop
|
||||
composer install --no-progress --optimize-autoloader
|
||||
yarn install
|
||||
yarn encore dev
|
||||
|
Loading…
Reference in New Issue
Block a user