Skip to content

Commit 4e986b9

Browse files
committed
change submodule
1 parent b623bca commit 4e986b9

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "geoshop-back"]
2+
path = geoshop-back
3+
url = https://github.com/sitn/geoshop-back.git

deploy.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ def eval_templates(in_file, out_file):
4242

4343
print(f"{str(datetime.datetime.now())} - DOCKER_HOST IS {os.environ['DOCKER_HOST']}")
4444

45-
os.rename('.env', '.env.local')
4645
subprocess.run(['docker-compose', 'build', 'api'])
4746
subprocess.run(['docker-compose', 'build', 'front'])
4847
subprocess.run(['docker-compose', 'down'])
4948
subprocess.run(['docker-compose', 'up', '-d'])
50-
os.rename('.env.local', '.env')
5149

5250
print(f"{str(datetime.datetime.now())} - END")

docker-compose.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
version: '3'
2-
31
services:
42
api:
53
image: ${DOCKER_BASE}-api
4+
pull_policy: build
65
build:
7-
context: ./back/
6+
context: ./geoshop-back/
87
env_file: ${ENV_FILE:-.env}
98
command: "gunicorn wsgi -b :8000 --timeout 90"
109
depends_on:
@@ -18,8 +17,9 @@ services:
1817

1918
migrate:
2019
image: geoshop-api
20+
pull_policy: build
2121
build:
22-
context: ./back/
22+
context: ./geoshop-back/
2323
dockerfile: Dockerfile
2424
env_file: ${ENV_FILE:-.env}
2525
command:
@@ -31,6 +31,7 @@ services:
3131

3232
front:
3333
image: ${DOCKER_BASE}-front
34+
pull_policy: build
3435
build:
3536
context: ./front/
3637
args:

geoshop-back

Submodule geoshop-back added at f8a0f95

0 commit comments

Comments
 (0)