A better attempt

silviogutierrez · May 3, 2024 · e821f6f · e821f6f
1 parent 8ffaeac
commit e821f6f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/development/Dockerfile b/development/Dockerfile
@@ -65,7 +65,7 @@ COPY --from=builder /app/collected collected
 ENV PYTHONUNBUFFERED 1
 ENV PATH="/app/.venv/bin:$PATH"
 ENV ENVIRONMENT=production
-RUN rm server/settings/__init__.py && echo 'export DJANGO_SETTINGS_MODULE=server.settings.$ENVIRONMENT' > /etc/profile
+RUN rm -f server/settings/__init__.py && echo 'export DJANGO_SETTINGS_MODULE=server.settings.$ENVIRONMENT' > /etc/profile
 ENTRYPOINT ["/bin/sh", "-lc"]
 # SSH commands are weird with fly for now, so we use this dirty script at the root level.
 RUN echo "source /etc/profile; cd /app; python manage.py migrate" > /migrate.sh && chmod +x /migrate.sh

diff --git a/packages/create-django-app/scripts/sync-development.sh b/packages/create-django-app/scripts/sync-development.sh
@@ -12,6 +12,5 @@ cp ../../requirements.nix template
 sed -i s#../requirements#./requirements# template/shell.nix
 sed -i s#../node_modules#./node_modules# template/.eslintrc.json
 rm template/server/settings/__init__.py
-ln -s localhost.py template/server/settings/__init__.py
 rm template/package.json
 cp template/.gitignore template/gitignore.template
diff --git a/packages/reactivated/scripts/setup_environment.sh b/packages/reactivated/scripts/setup_environment.sh
@@ -20,6 +20,13 @@ export PGDATABASE="database"
 export PGHOST=$TMP_ENV
 EXTERNAL_PID="$TMP_ENV/postmaster.pid"
 
+settings_file="server/settings/__init__.py"
+
+# Temporary fix with Nix issues.
+if [ ! -f "$settings_file" ]; then
+    ln -s localhost.py "$settings_file"
+fi
+
 if [ ! -d "$VIRTUAL_ENV" ]; then
     if [ -f "$EXTERNAL_PID" ]; then
         kill -9 "$(cat "$EXTERNAL_PID")"

diff --git a/website/Dockerfile b/website/Dockerfile
@@ -69,7 +69,7 @@ COPY --from=builder /app/collected collected
 ENV PYTHONUNBUFFERED 1
 ENV PATH="/app/.venv/bin:$PATH"
 ENV ENVIRONMENT=production
-RUN rm server/settings/__init__.py && echo 'export DJANGO_SETTINGS_MODULE=server.settings.$ENVIRONMENT' > /etc/profile
+RUN rm -f server/settings/__init__.py && echo 'export DJANGO_SETTINGS_MODULE=server.settings.$ENVIRONMENT' > /etc/profile
 ENTRYPOINT ["/bin/sh", "-lc"]
 # SSH commands are weird with fly for now, so we use this dirty script at the root level.
 RUN echo "source /etc/profile; cd /app; python manage.py migrate" > /migrate.sh && chmod +x /migrate.sh