Skip to content

Commit d927f0b

Browse files
committed
replace MESSAGES_FRONTEND_PORT by PORT, remove scalingo pgdump
1 parent f3f6108 commit d927f0b

File tree

5 files changed

+3
-49
lines changed

5 files changed

+3
-49
lines changed

bin/scalingo_pgdump.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

bin/scalingo_postfrontend

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ mv src/frontend/out build/frontend-out
1111

1212
mv src/backend/* ./
1313

14-
# Replace ${MESSAGES_FRONTEND_PORT} to Scalingo mandatory PORT env
1514
# Replace ${DJANGO_ADMIN_URL} to the erb equivalent with the "admin" default value
1615
# Replace every other shell variable to its erb equivalent
1716
sed \
18-
-e 's/\${MESSAGES_FRONTEND_PORT}/<%= ENV["PORT"] %>/g' \
1917
-e 's/\${DJANGO_ADMIN_URL}/<%= ENV["DJANGO_ADMIN_URL"] || "admin" %>/g' \
2018
-e 's/\${\([A-Z_][A-Z0-9_]*\)}/<%= ENV["\1"] %>/g' \
2119
src/frontend/nginx/nginx.conf.template > ./servers.conf.erb

cron.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/frontend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ FROM docker.io/nginxinc/nginx-unprivileged:1-alpine AS runtime-prod
2929
COPY --from=frontend-build /home/frontend/out /app
3030
COPY nginx/nginx.conf.template /etc/nginx/templates/default.conf.template
3131

32-
ENV MESSAGES_FRONTEND_PORT=8080
32+
ENV PORT=8080
3333
ENV MESSAGES_FRONTEND_BACKEND_SERVER=localhost:8000
3434
ENV DJANGO_ADMIN_URL=admin
3535

3636
HEALTHCHECK --interval=60s --timeout=3s --start-interval=10s \
37-
CMD curl -fsS http://localhost:${MESSAGES_FRONTEND_PORT}/health
37+
CMD curl -fsS http://localhost:${PORT}/health

src/frontend/nginx/nginx.conf.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ upstream backend_server {
33
}
44

55
server {
6-
listen ${MESSAGES_FRONTEND_PORT};
6+
listen ${PORT};
77
server_name _;
88
server_tokens off;
99
root /app;

0 commit comments

Comments
 (0)