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
5 changed files with 30 additions and 14 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] ...'
@@ -18,27 +18,27 @@
    "default": {
        "asgiref": {
            "hashes": [
-                "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0",
-                "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9"
+                "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4",
+                "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==3.5.0"
+            "version": "==3.5.2"
        },
        "django": {
            "hashes": [
-                "sha256:1239218849e922033a35d2a2f777cb8bee18bd725416744074f455f34ff50d0c",
-                "sha256:77ff2e7050e3324c9b67e29b6707754566f58514112a9ac73310f60cd5261930"
+                "sha256:07c8638e7a7f548dc0acaaa7825d84b7bd42b10e8d22268b3d572946f1e9b687",
+                "sha256:4e8177858524417563cc0430f29ea249946d831eacb0068a1455686587df40b5"
            ],
            "index": "pypi",
-            "version": "==4.0.3"
+            "version": "==4.0.4"
        },
        "dotmap": {
            "hashes": [
-                "sha256:6644faf2a9161db2f0136d5cc77b877cb1e87c17a46dbe345e5d4fea794fced2",
-                "sha256:cc87300f3a61d70f2bd18103ea2747dea846a2381a8321f43ce65cbd7afdfe3d"
+                "sha256:5821a7933f075fb47563417c0e92e0b7c031158b4c9a6a7e56163479b658b368",
+                "sha256:bd9fa15286ea2ad899a4d1dc2445ed85a1ae884a42effb87c89a6ecce71243c6"
            ],
            "index": "pypi",
-            "version": "==1.3.26"
+            "version": "==1.3.30"
        },
        "sqlparse": {
            "hashes": [
@@ -17,6 +17,11 @@ 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:
@@ -10,13 +10,16 @@ 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:
@@ -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	72dab60ecb	pipenv update	2022-05-25 13:57:30 +02:00