diff options
| -rw-r--r-- | dropped/template/docker-compose.yaml.template | 20 | ||||
| -rw-r--r-- | dropped/template/nginx/code.conf.template | 20 | ||||
| -rw-r--r-- | templates/docker-compose.yaml.template | 19 | ||||
| -rw-r--r-- | templates/nginx/conf.d/code.conf.template | 14 |
4 files changed, 40 insertions, 33 deletions
diff --git a/dropped/template/docker-compose.yaml.template b/dropped/template/docker-compose.yaml.template index 73ff4e8..1b28c5b 100644 --- a/dropped/template/docker-compose.yaml.template +++ b/dropped/template/docker-compose.yaml.template @@ -1,4 +1,21 @@ services: + debian-dev: + pull_policy: build + build: + context: ./docker/debian-dev + dockerfile: Dockerfile + pull: true + args: + - USER=crupest + tags: + - "crupest/debian-dev:latest" + container_name: debian-dev + init: true + command: [ "/bootstrap/start/code-server.bash" ] + volumes: + - ./data/debian-dev:/data + - debian-dev-home:/home/crupest + restart: on-failure:3 timeline: image: crupest/timeline:latest @@ -22,3 +39,6 @@ services: container_name: crupest-api volumes: - "./crupest-api-config.json:/crupest-api-config.json:ro" + +volumes: + debian-dev-home: diff --git a/dropped/template/nginx/code.conf.template b/dropped/template/nginx/code.conf.template new file mode 100644 index 0000000..205c7ba --- /dev/null +++ b/dropped/template/nginx/code.conf.template @@ -0,0 +1,20 @@ +server { + server_name code.${CRUPEST_DOMAIN}; + include common/https-listen; + + location / { + include common/proxy-common; + proxy_pass http://debian-dev:8080/; + } + + client_max_body_size 5G; +} + + +server { + server_name code.${CRUPEST_DOMAIN}; + include common/http-listen; + + include common/https-redirect; + include common/acme-challenge; +} diff --git a/templates/docker-compose.yaml.template b/templates/docker-compose.yaml.template index 6305b56..6de0c12 100644 --- a/templates/docker-compose.yaml.template +++ b/templates/docker-compose.yaml.template @@ -125,24 +125,6 @@ services: timeout: 3s retries: 0 - debian-dev: - pull_policy: build - build: - context: ./docker/debian-dev - dockerfile: Dockerfile - pull: true - args: - - USER=crupest - tags: - - "crupest/debian-dev:latest" - container_name: debian-dev - init: true - command: [ "/bootstrap/start/code-server.bash" ] - volumes: - - ./data/debian-dev:/data - - debian-dev-home:/home/crupest - restart: on-failure:3 - forgejo: image: code.forgejo.org/forgejo/forgejo:10 pull_policy: always @@ -199,5 +181,4 @@ services: volumes: blog-public: - debian-dev-home: roundcubemail-temp: diff --git a/templates/nginx/conf.d/code.conf.template b/templates/nginx/conf.d/code.conf.template index 205c7ba..aa70ebc 100644 --- a/templates/nginx/conf.d/code.conf.template +++ b/templates/nginx/conf.d/code.conf.template @@ -1,20 +1,6 @@ server { server_name code.${CRUPEST_DOMAIN}; - include common/https-listen; - - location / { - include common/proxy-common; - proxy_pass http://debian-dev:8080/; - } - - client_max_body_size 5G; -} - - -server { - server_name code.${CRUPEST_DOMAIN}; include common/http-listen; - include common/https-redirect; include common/acme-challenge; } |