update and build in makefile

Merge pull request #4 from MarcPartensky/requirements.txt
requirements.txt
2022-05-25 14:53:31 +02:00 · 2022-05-25 14:13:58 +02:00 · 2022-05-25 14:13:33 +02:00 · 2022-05-25 14:13:07 +02:00 · 2022-05-25 14:11:14 +02:00 · 2022-05-25 14:09:40 +02:00
4 changed files with 23 additions and 5 deletions
@@ -41,6 +41,14 @@ local: ## Run server in local without docker
 	pip install -r requirements.txt
 	./entrypoint.sh

+
+update:
+	pipenv update
+	pipenv lock -r > requirements.txt
+
+build: update
+	docker-compose -f $(DOCKER_COMPOSE) build
+
 # Special target help
 help: ## Show this help
 	@echo 'usage: make [target] ...'
@@ -17,6 +17,12 @@ services:
    labels:
      caddy: valentin-colin.fr
      caddy.reverse_proxy: "{{upstreams 80}}"
+      traefik.enable: "true"
+      traefik.http.routers.valentincolin_website.rule: Host(`valentin-colin.com`)
+      traefik.http.routers.valentincolin_website.entrypoints: websecure
+      traefik.http.routers.valentincolin_website.tls.certresolver: tls
+      traefik.http.services.valentincolin_website.loadbalancer.server.port: 80

 networks:
  caddy:
+    external: true
@@ -10,13 +10,17 @@ services:
    build:
      context: ./
      dockerfile: Dockerfile
-    ports:
-      - "8000:80"
    networks:
      - caddy
    labels:
      caddy: valentin-colin.fr
      caddy.reverse_proxy: "{{upstreams 80}}"
+      traefik.enable: "true"
+      traefik.http.routers.valentincolin_website.rule: Host(`valentin-colin.com`)
+      traefik.http.routers.valentincolin_website.entrypoints: websecure
+      traefik.http.routers.valentincolin_website.tls.certresolver: tls
+      traefik.http.services.valentincolin_website.loadbalancer.server.port: 80

 networks:
  caddy:
+    external: true
@@ -6,7 +6,7 @@
 #

 -i https://pypi.org/simple
-asgiref==3.5.0; python_version >= '3.7'
-django==4.0.3
-dotmap==1.3.26
+asgiref==3.5.2; python_version >= '3.7'
+django==4.0.4
+dotmap==1.3.30
 sqlparse==0.4.2; python_version >= '3.5'
Author	SHA1	Message	Date
marc	184d31aa97	update and build in makefile	2022-05-25 14:53:31 +02:00
Valentin Colin	dc81d0d6c2	Merge pull request #4 from MarcPartensky/requirements.txt requirements.txt	2022-05-25 14:13:58 +02:00
marc	5b5291e850	fail fix	2022-05-25 14:13:33 +02:00
marc	b698c344d6	pipfile.lock	2022-05-25 14:13:07 +02:00
marc	9f61da4e09	requirements.txt	2022-05-25 14:11:14 +02:00
Valentin Colin	a61f3f29c7	Merge pull request #3 from MarcPartensky/docker-compose-traefik Docker compose traefik	2022-05-25 14:09:40 +02:00
Valentin Colin	a922fd96b2	Merge pull request #2 from MarcPartensky/docker-compose Docker compose	2022-05-25 14:09:29 +02:00
Valentin Colin	ab8d3bd812	Merge pull request #1 from MarcPartensky/marc pipenv update	2022-05-25 14:09:17 +02:00
marc	cff25f8104	traefik dev	2022-05-25 14:05:10 +02:00
marc	733234d53e	traefik	2022-05-25 14:04:12 +02:00
marc	a0968dd0b8	docker-compose-dev-marc	2022-05-25 14:00:52 +02:00
marc	9d8261812d	docker-compose-marc.yml	2022-05-25 14:00:12 +02:00