Ver código fonte

Merge branch 'release/v0.0.9'

Jérôme BUISINE 4 anos atrás
pai
commit
fddf5b4ba8
5 arquivos alterados com 18 adições e 3 exclusões
  1. 3 0
      .dockerignore
  2. 9 0
      Makefile
  3. 4 1
      README.md
  4. 1 1
      ThesisWebExpeDjango/settings.py
  5. 1 1
      docker-compose.yml

+ 3 - 0
.dockerignore

@@ -0,0 +1,3 @@
+/images
+/.vscode
+/.python-version

+ 9 - 0
Makefile

@@ -36,4 +36,13 @@ remove:
 	@echo "App is now stopped and removed"
 	@echo "----------------------------------------------------------------"
 
+clean: 
+	@echo "----------------------------------------------------------------"
+	@echo "Process to remove image"
+	@echo "----------------------------------------------------------------"
+	docker rmi djangowebexpe
+	@echo "----------------------------------------------------------------"
+	@echo "djangowebexpe image is now deleted"
+	@echo "----------------------------------------------------------------"
+
 deploy: build run

+ 4 - 1
README.md

@@ -50,7 +50,10 @@ make deploy
 
 Will run `build` and `run` commands at once.
 
-You also have `stop` and `remove` commands to stop and remove current generated docker instance.
+You also have `stop`, `remove`, `clean` commands:
+- `stop`: stop current container instance if exists
+- `remove`: stop and remove container instance if exists
+- `clean`: remove docker image if exists
 
 ## How to contribute ?
 

+ 1 - 1
ThesisWebExpeDjango/settings.py

@@ -25,7 +25,7 @@ SECRET_KEY = 'lsz*#tezp#cp+xowok*+tddp*5((%o27(6i$1tneykf9*y4gyg'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ["diran.univ-littoral.fr", "localhost", "127.0.0.1"]
 
 
 # Application definition

+ 1 - 1
docker-compose.yml

@@ -7,6 +7,6 @@ services:
         image: djangowebexpe
         restart: always
         volumes:
-            - "./media:/usr/src/media" # get access to log files
+            - "./media:/usr/src/app/media" # get access to media files
         ports:
            - "8000:8000"