Skip to content

Commit fd58e8d

Browse files
nbejansennbejansen
committed
Update environment
1 parent 4069a92 commit fd58e8d

File tree

12 files changed

+54
-39
lines changed

12 files changed

+54
-39
lines changed

‎bin/inc/config

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,70 @@ export STACK_ADMIN_USERNAME="admin"
66
export STACK_ADMIN_PASSWORD=""
77
export STACK_ADMIN_EMAIL="[email protected]"
88
export STACK_ADMIN_ORG="Stack"
9+
export STACK_HTTP_PORT=80
10+
export STACK_HTTPS_PORT=443
911

1012
# Backup
1113
export STACK_BACKUP_DIR=""
1214
export STACK_BACKUP_CLEANUP_DAYS="30"
1315

16+
# Runtime
17+
export STACK_RUNTIME_TAG="1.0.2"
18+
export STACK_RUNTIME_IMAGE="ghcr.io/vanegmondgroep/runtime"
19+
1420
# MySQL
1521
export STACK_MYSQL_ENABLED=false
22+
export STACK_MYSQL_IMAGE="docker.io/bitnami/mariadb"
23+
export STACK_MYSQL_TAG="10.5"
1624
export STACK_MYSQL_DATABASE="stack"
1725
export STACK_MYSQL_USERNAME=""
1826
export STACK_MYSQL_PASSWORD=""
1927
export STACK_MYSQL_ROOT_PASSWORD=""
2028

2129
# InfluxDB
2230
export STACK_INFLUXDB_ENABLED=false
31+
export STACK_INFLUXDB_IMAGE="influxdb"
32+
export STACK_INFLUXDB_TAG="2.0.4"
2333
export STACK_INFLUXDB_BUCKET="stack"
2434
export STACK_INFLUXDB_ORG=""
2535
export STACK_INFLUXDB_USERNAME=""
2636
export STACK_INFLUXDB_PASSWORD=""
2737
export STACK_INFLUXDB_ADMIN_TOKEN=""
38+
export STACK_INFLUXDB_PORT=8086
2839

2940
# Grafana
3041
export STACK_GRAFANA_ENABLED=false
42+
export STACK_GRAFANA_IMAGE="grafana/grafana"
43+
export STACK_GRAFANA_TAG="8.1.2"
3144
export STACK_GRAFANA_USERNAME=""
3245
export STACK_GRAFANA_PASSWORD=""
3346

3447
# Redis
3548
export STACK_REDIS_ENABLED=false
49+
export STACK_REDIS_IMAGE="bitnami/redis"
50+
export STACK_REDIS_TAG="6.2"
3651

3752
# Mailhog
3853
export STACK_MAILHOG_ENABLED=false
54+
export STACK_MAILHOG_IMAGE="mailhog/mailhog"
55+
export STACK_MAILHOG_TAG="latest"
3956

4057
# Node-RED
4158
export STACK_NODERED_ENABLED=false
59+
export STACK_NODERED_IMAGE="nodered/node-red"
60+
export STACK_NODERED_TAG="1.3.6"
4261

4362
# PhpMyAdmin
4463
export STACK_PHPMYADMIN_ENABLED=false
64+
export STACK_PHPMYADMIN_IMAGE="bitnami/phpmyadmin"
65+
export STACK_PHPMYADMIN_TAG="5"
66+
67+
# Stack
68+
export STACK_UID=`id -u`
69+
export STACK_PROJECT_DIR=$(pwd)
70+
export STACK_STUBS_DIR=$STACK_WORKDIR/stubs
71+
export STACK_DATA_DIR=$STACK_PROJECT_DIR/.stack
72+
export STACK_PROJECT_NAME="$(basename $STACK_PROJECT_DIR)"
73+
export STACK_ENV_FILE=$STACK_PROJECT_DIR/.env
74+
export STACK_CONTAINER_DATA_DIR="/opt/stack/data"
75+
export STACK_CONTAINER_PUBLIC_DIR="/home/runtime/public"

‎bin/inc/functions

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,18 @@ function dockerCompose {
5858
}
5959

6060
function init {
61+
PASSWORD=$(openssl rand -base64 12)
62+
6163
if [ ! -d $STACK_DATA_DIR ]; then
6264
mkdir $STACK_DATA_DIR
6365
fi
6466

6567
if [ ! -f $STACK_ENV_FILE ]; then
66-
cp "$STACK_STUBS_DIR/.env.stub" "$STACK_PROJECT_DIR/.env"
68+
touch $STACK_ENV_FILE
69+
echo "STACK_ADMIN_PASSWORD='${PASSWORD}'" >> $STACK_ENV_FILE
70+
else
71+
source $STACK_ENV_FILE
72+
[ ! -n "${STACK_ADMIN_PASSWORD:-}" ] && echo -e "\nSTACK_ADMIN_PASSWORD=\"${PASSWORD}\"" >> $STACK_ENV_FILE
6773
fi
6874

6975
if [ ! -f $STACK_DATA_DIR/.gitignore ]; then

‎bin/stack

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,19 @@ set -e
44
set -u
55
set -o pipefail
66

7-
export STACK_UID=`id -u`
87
export STACK_WORKDIR=$(realpath $(dirname $(realpath $0))/../)
9-
export STACK_PROJECT_DIR=$(pwd)
108
export STACK_INC_DIR=$STACK_WORKDIR/bin/inc
11-
export STACK_STUBS_DIR=$STACK_WORKDIR/stubs
12-
export STACK_DATA_DIR=$STACK_PROJECT_DIR/.stack
13-
export STACK_PROJECT_NAME="$(basename $STACK_PROJECT_DIR)"
14-
export STACK_ENV_FILE=$STACK_PROJECT_DIR/.env
15-
export STACK_CONTAINER_DATA_DIR="/opt/stack/data"
16-
export STACK_CONTAINER_PUBLIC_DIR="/home/runtime/public"
179

10+
source $STACK_INC_DIR/config
1811
source $STACK_INC_DIR/functions
1912

2013
if [ ! -f $STACK_ENV_FILE ] && [ "$1" != "init" ]; then
2114
error "Could not locate .env file ($STACK_ENV_FILE)"
2215
elif [ -f $STACK_ENV_FILE ]; then
23-
source $STACK_INC_DIR/config
2416
source $STACK_ENV_FILE
17+
source $STACK_INC_DIR/defaults
2518
fi
2619

27-
source $STACK_INC_DIR/defaults
28-
2920
case $1 in
3021
init)
3122
init

‎docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ version: "3"
33

44
services:
55
runtime:
6-
image: ghcr.io/vanegmondgroep/runtime:${RUNTIME_VERSION:-1.0.2}
6+
image: ${STACK_RUNTIME_IMAGE:?}:${STACK_RUNTIME_TAG}
77
restart: always
88
ports:
9-
- "${STACK_HTTP_PORT:-80}:80"
10-
- "${STACK_HTTPS_PORT:-443}:443"
9+
- "${STACK_HTTP_PORT:?}:80"
10+
- "${STACK_HTTPS_PORT:?}:443"
1111
volumes:
1212
- "${STACK_DATA_DIR:?}:${STACK_CONTAINER_DATA_DIR:?}"
1313
- "${STACK_DATA_DIR:?}/runtime.yml:/opt/runtime/config/custom.yml:ro"

‎services/grafana.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
grafana:
4-
image: "grafana/grafana:${STACK_GRAFANA_VERSION:-8.1.2}"
4+
image: "${STACK_GRAFANA_IMAGE:?}:${STACK_GRAFANA_TAG:?}"
55
restart: always
66
environment:
77
GF_SERVER_ROOT_URL: "/svc/grafana/"

‎services/influxdb.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
services:
33
influxdb:
4-
image: "influxdb:${STACK_INFLUXDB_VERSION:-2.0.4}"
4+
image: "${STACK_INFLUXDB_IMAGE:?}:${STACK_INFLUXDB_TAG:?}"
55
restart: always
66
environment:
7-
DOCKER_INFLUXDB_INIT_MODE: 'setup'
7+
DOCKER_INFLUXDB_INIT_MODE: "setup"
88
DOCKER_INFLUXDB_INIT_ORG: ${STACK_INFLUXDB_ORG:?}
99
DOCKER_INFLUXDB_INIT_BUCKET: ${STACK_INFLUXDB_BUCKET:?}
1010
DOCKER_INFLUXDB_INIT_USERNAME: ${STACK_INFLUXDB_USERNAME:?}
1111
DOCKER_INFLUXDB_INIT_PASSWORD: ${STACK_INFLUXDB_PASSWORD:?}
1212
DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${STACK_INFLUXDB_ADMIN_TOKEN:?}
1313
ports:
14-
- ${STACK_INFLUXDB_PORT:-8086}:8086
14+
- ${STACK_INFLUXDB_PORT:?}:8086
1515
volumes:
1616
- "influxdb:/var/lib/influxdb2"
1717
- "${STACK_DATA_DIR:?}:${STACK_CONTAINER_DATA_DIR:?}"

‎services/mailhog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
services:
33
mailhog:
4-
image: "mailhog/mailhog:${STACK_MAILHOG_VERSION:-latest}"
4+
image: "${STACK_MAILHOG_IMAGE:?}:${STACK_MAILHOG_TAG:?}"
55
restart: always

‎services/mysql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
mysql:
4-
image: "docker.io/bitnami/mariadb:${STACK_MYSQL_VERSION:-10.5}"
4+
image: "${STACK_MYSQL_IMAGE:?}:${STACK_MYSQL_TAG:?}"
55
restart: always
66
environment:
77
MARIADB_ROOT_PASSWORD: ${STACK_MYSQL_ROOT_PASSWORD:?}
@@ -12,11 +12,11 @@ services:
1212
- "mysql:/bitnami/mariadb"
1313
- "${STACK_DATA_DIR:?}:${STACK_CONTAINER_DATA_DIR:?}"
1414
healthcheck:
15-
test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh']
15+
test: ["CMD", "/opt/bitnami/scripts/mariadb/healthcheck.sh"]
1616
interval: 5s
1717
timeout: 5s
1818
retries: 6
1919

2020
volumes:
2121
mysql:
22-
driver: local
22+
driver: local

‎services/node-red.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
node-red:
4-
image: nodered/node-red:${STACK_NODERED_VERSION:-1.3.6}
4+
image: ${STACK_NODERED_IMAGE:?}:${STACK_NODERED_TAG:?}
55
restart: always
66
volumes:
77
- "node-red:/data"

‎services/phpmyadmin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
phpmyadmin:
4-
image: "docker.io/bitnami/phpmyadmin:${PMA_VERSION:-5}"
4+
image: "${STACK_PHPMYADMIN_IMAGE:?}:${STACK_PHPMYADMIN_TAG:?}"
55
restart: always
66
environment:
77
DATABASE_HOST: mysql

0 commit comments

Comments
 (0)