summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile7
-rw-r--r--docker/docker-compose.yml4
-rw-r--r--docker/noria/Dockerfile12
3 files changed, 14 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e8916e6..67662c3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,11 +1,12 @@
# composer install
FROM liuchong/rustup:nightly as build
COPY ./ /app/
-RUN cargo build cargo r --release
+WORKDIR /app
+RUN cargo build --release
-FROM alpine as spotify_intersect
+FROM debian as spotify_intersect
WORKDIR /srv/spotify_intersect
-COPY --from=build /app/target/release/spotify_intersect /srv/spotify_intersect
+COPY --from=build /app/target/release/spotify_intersect ./
COPY .env /srv/spotify_intersect/.env
CMD ./spotify_intersect
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index cefa228..f388575 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -21,12 +21,16 @@ services:
#- db:/srv/noria
networks:
- database
+ depends_on:
+ - zookeeper
#volumes:
#db: {}
zookeeper:
image: 'bitnami/zookeeper:latest'
networks:
- database
+ environment:
+ ALLOW_ANONYMOUS_LOGIN: "yes"
networks:
database:
diff --git a/docker/noria/Dockerfile b/docker/noria/Dockerfile
index 67a8c8b..10b7145 100644
--- a/docker/noria/Dockerfile
+++ b/docker/noria/Dockerfile
@@ -2,13 +2,13 @@
FROM liuchong/rustup:nightly as build
WORKDIR /app
RUN apt-get update
-RUN apt-get -y install git
+RUN apt-get -y install git clang libclang-dev libssl-dev liblz4-dev
RUN git clone https://github.com/mit-pdos/noria /app
-RUN cargo build --release --bin noria-server
+RUN cargo build --release --bin noria-server
+#RUN file target/release/noria/server
-FROM alpine as spotify_intersect
+FROM debian as spotify_intersect
WORKDIR /srv/noria
-COPY --from=build /app/target/release/noria /srv/noria
-COPY .env /srv/spotify_intersect/.env
-CMD ./noria --deployment track_db --no-reuse
+COPY --from=build /app/target/release/noria-server /usr/bin
+CMD noria-server --deployment track_db --no-reuse -z zookeeper:2181