diff --git a/Dockerfile b/Dockerfile index f2df85b..1301722 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,11 @@ RUN apk update && apk upgrade \ USER databox WORKDIR /home/databox -ADD . databox-export-service +ADD . export-service RUN sudo apk add alpine-sdk bash ncurses-dev \ && sudo apk add opam \ - && cd databox-export-service \ + && cd export-service \ && sudo chmod +x install.sh && sync \ && ./install.sh \ && sudo apk del alpine-sdk bash ncurses-dev \ @@ -27,4 +27,4 @@ EXPOSE 8080 LABEL databox.type="export-service" -ENTRYPOINT ["./export-service"] \ No newline at end of file +ENTRYPOINT ["./service"] diff --git a/Dockerfile-aarch64 b/Dockerfile-aarch64 index 536d220..0adc253 100644 --- a/Dockerfile-aarch64 +++ b/Dockerfile-aarch64 @@ -13,11 +13,11 @@ RUN apk update && apk upgrade \ USER databox WORKDIR /home/databox -ADD . databox-export-service +ADD . export-service RUN sudo apk add alpine-sdk bash ncurses-dev \ && sudo apk add opam \ - && cd databox-export-service \ + && cd export-service \ && sudo chmod +x install.sh && sync \ && ./install.sh \ && sudo apk del alpine-sdk bash ncurses-dev \ @@ -27,4 +27,4 @@ EXPOSE 8080 LABEL databox.type="export-service" -ENTRYPOINT ["./export-service"] +ENTRYPOINT ["./service"] diff --git a/install.sh b/install.sh index cb8d26d..5fca1d4 100644 --- a/install.sh +++ b/install.sh @@ -13,9 +13,9 @@ opam pin add -n macaroons https://github.com/me-box/ocaml-macaroons.git opam pin add -n depyt https://github.com/me-box/depyt.git#fix-opam opam pin add -n opium https://github.com/me-box/opium.git#fix-ssl-option -opam pin add -y databox-export-service . +opam pin add -y export-service . -mv /home/databox/.opam/system/bin/databox-export-service /home/databox/export-service +mv /home/databox/.opam/system/bin/export-service /home/databox/service rm -rf /home/databox/.opam sudo apk del m4 perl diff --git a/opam b/opam index 14e4edd..5511727 100644 --- a/opam +++ b/opam @@ -2,10 +2,10 @@ opam-version: "1.2" maintainer: "Qi Li " authors: ["Qi Li "] version: "0.0.1" -homepage: "https://github.com/me-box/databox-export-service" +homepage: "https://github.com/me-box/core-export-service" license: "MIT" -dev-repo: "https://github.com/me-box/databox-export-service.git" -bug-reports: "https://github.com/me-box/databox-export-service/issues" +dev-repo: "https://github.com/me-box/core-export-service.git" +bug-reports: "https://github.com/me-box/core-export-service/issues" tags: [] available: [ ocaml-version >= "4.01.0"] diff --git a/pkg/META b/pkg/META index f37ca01..968606e 100644 --- a/pkg/META +++ b/pkg/META @@ -1,7 +1,7 @@ -description = "bridge component for databox" +description = "core export service for databox" version = "%%VERSION_NUM%%" requires = "" -archive(byte) = "databox-bridge.cma" -archive(native) = "databox-bridge.cmxa" -plugin(byte) = "databox-bridge.cma" -plugin(native) = "databox-bridge.cmxs" +archive(byte) = "export-service.cma" +archive(native) = "export-service.cmxa" +plugin(byte) = "export-service.cma" +plugin(native) = "export-service.cmxs" diff --git a/pkg/pkg.ml b/pkg/pkg.ml index d1d5c65..d763f3d 100755 --- a/pkg/pkg.ml +++ b/pkg/pkg.ml @@ -4,10 +4,10 @@ open Topkg let () = - Pkg.describe "databox-export-service" @@ fun c -> + Pkg.describe "export-service" @@ fun c -> Ok [ - Pkg.mllib "src/databox-export-service.mllib"; - Pkg.bin "bin/service" ~dst:"databox-export-service"; + Pkg.mllib "src/export-service.mllib"; + Pkg.bin "bin/service" ~dst:"export-service"; Pkg.test "test/test_polling"; Pkg.test "test/test_ws" ] diff --git a/src/databox-export-service.mllib b/src/export-service.mllib similarity index 100% rename from src/databox-export-service.mllib rename to src/export-service.mllib diff --git a/src/export_env.ml b/src/export_env.ml index 9e2b913..5e4b62e 100644 --- a/src/export_env.ml +++ b/src/export_env.ml @@ -1,7 +1,7 @@ -let local_name = ref "databox-export-service" +let local_name = ref "export-service" let local_port = ref "8080" -let arbiter_endpoint = ref "https://databox-arbiter:8080" +let arbiter_endpoint = ref "https://arbiter:8080" let arbiter_key = ref "" let secrets_dir = Fpath.v "/run/secrets/"