Merge pull request scpwiki#1009 from scpwiki/deepwell-database

Add .env file for API service in dev/prod
scp-cs · May 26, 2022 · 9b3c255 · 9b3c255
2 parents 3715291 + 92a7cb9
commit 9b3c255
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+DATABASE_URL=postgres://wikijump:wikijump@database/wikijump
diff --git a/install/files/dev/env → install/files/dev/php_env b/install/files/dev/env → install/files/dev/php_env
diff --git a/install/files/local/env → install/files/local/php_env b/install/files/local/env → install/files/local/php_env
diff --git a/install/files/prod/api_env b/install/files/prod/api_env
@@ -0,0 +1 @@
+DATABASE_URL=postgres://wikijump:wikijump@database/wikijump
diff --git a/install/files/prod/env → install/files/prod/php_env b/install/files/prod/env → install/files/prod/php_env
diff --git 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 && \
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		DATABASE_URL=postgres://wikijump:wikijump@database/wikijump