🐳 Set up envs for the TDrive (#19)

- remove php upstream from nginx config
- fix docker-compose configuration
This commit is contained in:
Anton Shepilov
2023-04-13 15:27:10 +02:00
committed by GitHub
parent e0615fa867
commit 01630194fc
7 changed files with 75 additions and 57 deletions
+6
View File
@@ -0,0 +1,6 @@
FROM ubuntu
RUN apt-get update && \
apt-get install -y iputils-ping && \
apt-get install -y telnet && \
apt-get install -y wget
CMD bash
@@ -39,10 +39,8 @@ case $SSL_CERTS in
esac
NODE_HOST="${NODE_HOST:-http://node:3000}"
PHP_UPSTREAM="${PHP_UPSTREAM:-php:9000}"
export NODE_HOST
export PHP_UPSTREAM
envsubst '$${NODE_HOST} $${NGINX_LISTEN}' < /etc/nginx/sites-available/site.template > /etc/nginx/sites-enabled/site
echo "upstream php-upstream { server ${PHP_UPSTREAM}; }" > /etc/nginx/conf.d/upstream.conf
nginx -g "daemon off;"
-11
View File
@@ -97,15 +97,4 @@ server {
rewrite ^(.*)$ /app.php/$1 last;
}
location ~ ^/(app|app_dev|config|dev\/.*)\.php(/|$) {
fastcgi_pass php-upstream;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param HTTPS off;
fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k;
}
}
+8 -7
View File
@@ -28,13 +28,14 @@ FROM node-base as installed-libs
COPY backend/node/ .
#Install dev dependancies for build
RUN NODE_ENV=development npm install && \
#Build in production mode
export NODE_ENV=production && \
npm run build && \
rm -rf node_modules && \
#Install prod dependancies after build
npm install --legacy-peer-deps
RUN export NODE_ENV=development
RUN npm install
#Build in production mode
RUN export NODE_ENV=production
RUN npm run build
RUN rm -rf node_modules
#Install prod dependancies after build
RUN npm install --legacy-peer-deps
# Development Stage
FROM installed-libs as development