Skip to content

Commit

Permalink
Merge pull request #22 from me-box/renameing
Browse files Browse the repository at this point in the history
Update name
  • Loading branch information
Toshbrown committed Jul 13, 2017
2 parents 02bb5d8 + 0919359 commit d576ad7
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Expand Up @@ -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 \
Expand All @@ -27,4 +27,4 @@ EXPOSE 8080

LABEL databox.type="export-service"

ENTRYPOINT ["./export-service"]
ENTRYPOINT ["./service"]
6 changes: 3 additions & 3 deletions Dockerfile-aarch64
Expand Up @@ -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 \
Expand All @@ -27,4 +27,4 @@ EXPOSE 8080

LABEL databox.type="export-service"

ENTRYPOINT ["./export-service"]
ENTRYPOINT ["./service"]
4 changes: 2 additions & 2 deletions install.sh
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions opam
Expand Up @@ -2,10 +2,10 @@ opam-version: "1.2"
maintainer: "Qi Li <liqi0425@gmail.com>"
authors: ["Qi Li <liqi0425@gmail.com>"]
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"]
Expand Down
10 changes: 5 additions & 5 deletions 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"
6 changes: 3 additions & 3 deletions pkg/pkg.ml
Expand Up @@ -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"
]
File renamed without changes.
4 changes: 2 additions & 2 deletions 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/"
Expand Down

0 comments on commit d576ad7

Please sign in to comment.