mirror of
https://github.com/ClusterCockpit/cc-docker.git
synced 2025-07-23 05:11:41 +02:00
Cleanup and fix inconsistencies.
Remove ping check for github.
This commit is contained in:
@@ -70,14 +70,16 @@ ARG APP_ENVIRONMENT
|
||||
ENV APP_ENV=${APP_ENVIRONMENT}
|
||||
ENV APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629
|
||||
ENV APP_DEBUG=1
|
||||
ENV REDIS_URL=redis://cc-redis
|
||||
ARG INFLUXDB_PORT
|
||||
ARG INFLUXDB_PASSWORD
|
||||
ARG INFLUXDB_ADMIN_TOKEN
|
||||
ARG MYSQL_PASSWORD
|
||||
ENV INFLUXDB_URL=influxdb://symfony:${INFLUXDB_PASSWORD}@cc-influxdb:8086/ClusterCockpit
|
||||
ENV INFLUXDB_V2_URL=http://cc-influxdb:8086
|
||||
ENV REDIS_URL=redis://cc-redis
|
||||
ENV INFLUXDB_URL=http://cc-influxdb:${INFLUXDB_PORT}
|
||||
ENV INFLUXDB_TOKEN=${INFLUXDB_ADMIN_TOKEN}
|
||||
ENV DATABASE_URL=mysql://symfony:${MYSQL_PASSWORD}@db:3306/ClusterCockpit
|
||||
ARG MYSQL_USER
|
||||
ARG MYSQL_PASSWORD
|
||||
ARG MYSQL_DATABASE
|
||||
ENV DATABASE_URL=mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@cc-db:3306/${MYSQL_DATABASE}
|
||||
ENV CORS_ALLOW_ORIGIN=^https?://(localhost|127\\.0\\.0\\.1)(:[0-9]+)?$
|
||||
|
||||
WORKDIR /var/www/symfony
|
||||
|
@@ -2,12 +2,6 @@
|
||||
|
||||
if [ "$APP_CLUSTERCOCKPIT_INIT" = true ]; then
|
||||
|
||||
# Wait for docker dns able to resolve gitub
|
||||
# Solves weird special case of container loading faster than github can be reached
|
||||
until ping -c 1 github.com > /dev/null ; do
|
||||
echo "Could not reach github.com yet ..."
|
||||
sleep 1
|
||||
done
|
||||
|
||||
rm -rf /var/www/symfony/* /var/www/symfony/.??*
|
||||
git clone https://github.com/ClusterCockpit/ClusterCockpit .
|
||||
|
Reference in New Issue
Block a user