From 6edb943de4eb2efa7a814671bca878193ce7d599 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 23 Jun 2020 23:20:05 +0200
Subject: [PATCH] Minor fixes to ordering and code style.
---
docker/Dockerfile.dev | 2 +-
docker/docker-compose.yaml | 2 +-
requirements.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index b66138df1..55917ab79 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -11,7 +11,7 @@ ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
# Salesforce Integration
-ENV SALESFORCE_INTEGRATION 1
+ENV SALESFORCE_INTEGRATION true
# Set owner on /usr/local.
RUN sudo chown -R circleci:circleci /usr/local
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 9d1a01f89..24d8b1836 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -18,7 +18,7 @@ services:
build:
context: ..
dockerfile: docker/Dockerfile.dev
- env_file:
+ env_file:
- salesforce.env
ports:
- 9001:9001
diff --git a/requirements.txt b/requirements.txt
index d5ef048c7..37c60a836 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,6 +24,7 @@ django-tables2==2.2.1
django-tinymce4-lite==1.8.0
django-two-factor-auth==1.11.0
django-webpack-loader==0.7.0
+django-salesforce==1.0
django_select2==7.2.2
djangorestframework==3.9.2
djangorestframework-api-key==1.4.1
@@ -41,4 +42,3 @@ tomd==0.1.3
wagtail==2.9
wagtail-cache==1.0.0
whitenoise==5.1.0
-django-salesforce==1.0
--
GitLab