diff --git a/docker/fly.toml b/docker/fly.toml index 7c93a40..e692f85 100644 --- a/docker/fly.toml +++ b/docker/fly.toml @@ -1,7 +1,9 @@ -app = "rem" +# fly.toml file generated for docker-mat-services on 2022-10-19T18:24:52-04:00 + +app = "docker-mat-services" kill_signal = "SIGINT" kill_timeout = 5 -[[mounts]] +[mounts] destination = "/data" - source = "data" + source = "docker_data" diff --git a/drone/Dockerfile b/drone/Dockerfile index 9354c99..6f26dff 100644 --- a/drone/Dockerfile +++ b/drone/Dockerfile @@ -5,3 +5,6 @@ FROM drone/drone:latest COPY --from=runner /bin/tmate /bin/ COPY --from=runner /bin/drone-runner-docker /bin/ LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT" + +ENTRYPOINT [] +CMD "" diff --git a/drone/fly.toml b/drone/fly.toml index ea1f482..25db445 100644 --- a/drone/fly.toml +++ b/drone/fly.toml @@ -1,32 +1,34 @@ -# fly.toml file generated for drone-mat-services on 2022-10-18T23:11:25-04:00 +# fly.toml file generated for drone-mat-services on 2022-10-19T18:21:38-04:00 app = "drone-mat-services" kill_signal = "SIGINT" kill_timeout = 5 [processes] -server = "/bin/drone-server" -runner = "/bin/drone-runner-docker" - -[build] + runner = "/bin/drone-runner-docker" + server = "/bin/drone-server" [env] DRONE_GITEA_SERVER = "https://git.mat.services" - DRONE_SERVER_HOST = "build.mat.services" - DRONE_JSONNET_ENABLED = true - DRONE_REGISTRATION_CLOSED = true - DRONE_RPC_HOST = "localhost" + DRONE_JSONNET_ENABLED = "true" + DRONE_REGISTRATION_CLOSED = "true" DRONE_RPC_PROTO = "http" + DRONE_SERVER_HOST = "build.mat.services" + DRONE_SERVER_PROTO = "https" [experimental] allowed_public_ports = [] auto_rollback = true -[[services]] +[mounts] + destination = "/data" processes = ["server"] + source = "drone_data" + +[[services]] http_checks = [] - internal_port = 8080 - processes = ["app"] + internal_port = 80 + processes = ["server"] protocol = "tcp" script_checks = [] [services.concurrency]