diff --git a/install/aws/dev/docker/api/Dockerfile b/install/aws/dev/docker/api/Dockerfile index bb2808d84a..bc3edf75e0 100644 --- a/install/aws/dev/docker/api/Dockerfile +++ b/install/aws/dev/docker/api/Dockerfile @@ -28,6 +28,7 @@ RUN apk add --no-cache curl COPY --from=rust /src/deepwell/target/release/deepwell /usr/local/bin/deepwell COPY ./locales/fluent /opt/locales/fluent COPY ./install/files/api/health-check.sh /bin/wikijump-health-check +COPY ./install/files/dev/api_env /.env USER daemon CMD ["/usr/local/bin/deepwell"] diff --git a/install/aws/dev/docker/php-fpm/Dockerfile b/install/aws/dev/docker/php-fpm/Dockerfile index b47d95b4fc..867a4080d4 100644 --- a/install/aws/dev/docker/php-fpm/Dockerfile +++ b/install/aws/dev/docker/php-fpm/Dockerfile @@ -45,7 +45,7 @@ COPY ./web /var/www/wikijump/web # Inject values in the wikijump.ini and .env configuration files USER root COPY ./install/files/${ENVIRONMENT}/wikijump.ini conf/wikijump.ini -COPY ./install/files/${ENVIRONMENT}/env .env +COPY ./install/files/${ENVIRONMENT}/php_env .env RUN sed -i "s/%%BASE_DOMAIN%%/${MAIN_DOMAIN}/g" conf/wikijump.ini && \ sed -i "s/%%MAIN_WIKI%%/${WWW_DOMAIN}/g" conf/wikijump.ini && \ diff --git a/install/aws/prod/docker/api/Dockerfile b/install/aws/prod/docker/api/Dockerfile index bb2808d84a..af5e8b4285 100644 --- a/install/aws/prod/docker/api/Dockerfile +++ b/install/aws/prod/docker/api/Dockerfile @@ -28,6 +28,7 @@ RUN apk add --no-cache curl COPY --from=rust /src/deepwell/target/release/deepwell /usr/local/bin/deepwell COPY ./locales/fluent /opt/locales/fluent COPY ./install/files/api/health-check.sh /bin/wikijump-health-check +COPY ./install/files/prod/api_env /.env USER daemon CMD ["/usr/local/bin/deepwell"] diff --git a/install/aws/prod/docker/php-fpm/Dockerfile b/install/aws/prod/docker/php-fpm/Dockerfile index b50a77e4d0..472e5cc2ce 100644 --- a/install/aws/prod/docker/php-fpm/Dockerfile +++ b/install/aws/prod/docker/php-fpm/Dockerfile @@ -45,7 +45,7 @@ COPY ./web /var/www/wikijump/web # Inject values in the wikijump.ini and .env configuration files USER root COPY ./install/files/${ENVIRONMENT}/wikijump.ini conf/wikijump.ini -COPY ./install/files/${ENVIRONMENT}/env .env +COPY ./install/files/${ENVIRONMENT}/php_env .env RUN sed -i "s/%%BASE_DOMAIN%%/${MAIN_DOMAIN}/g" conf/wikijump.ini && \ sed -i "s/%%MAIN_WIKI%%/${WWW_DOMAIN}/g" conf/wikijump.ini && \ diff --git a/install/files/dev/api_env b/install/files/dev/api_env new file mode 100644 index 0000000000..dbaeb8f9fe --- /dev/null +++ b/install/files/dev/api_env @@ -0,0 +1 @@ +DATABASE_URL=postgres://wikijump:wikijump@database/wikijump diff --git a/install/files/dev/env b/install/files/dev/php_env similarity index 100% rename from install/files/dev/env rename to install/files/dev/php_env diff --git a/install/files/local/env b/install/files/local/php_env similarity index 100% rename from install/files/local/env rename to install/files/local/php_env diff --git a/install/files/prod/api_env b/install/files/prod/api_env new file mode 100644 index 0000000000..dbaeb8f9fe --- /dev/null +++ b/install/files/prod/api_env @@ -0,0 +1 @@ +DATABASE_URL=postgres://wikijump:wikijump@database/wikijump diff --git a/install/files/prod/env b/install/files/prod/php_env similarity index 100% rename from install/files/prod/env rename to install/files/prod/php_env diff --git a/install/local/dev/php-fpm/Dockerfile b/install/local/dev/php-fpm/Dockerfile index 41a981a8d1..24fd379cd1 100644 --- a/install/local/dev/php-fpm/Dockerfile +++ b/install/local/dev/php-fpm/Dockerfile @@ -57,7 +57,7 @@ COPY ./web /var/www/wikijump/web # Inject values in the wikijump.ini and .env configuration files USER root COPY ./install/files/${ENVIRONMENT}/wikijump.ini conf/wikijump.ini -COPY ./install/files/${ENVIRONMENT}/env .env +COPY ./install/files/${ENVIRONMENT}/php_env .env RUN sed -i "s/%%BASE_DOMAIN%%/${MAIN_DOMAIN}/g" conf/wikijump.ini && \ sed -i "s/%%MAIN_WIKI%%/${WWW_DOMAIN}/g" conf/wikijump.ini && \