From 394bcfe59485b96639c35a57e67c2331cf5c434d Mon Sep 17 00:00:00 2001
From: Dennis Kobert <dennis@kobert.dev>
Date: Tue, 11 Feb 2020 20:15:10 +0000
Subject: Add certificates to server

---
 docker/Dockerfile         |  2 +-
 docker/docker-compose.yml | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 88e1cbc..15b712d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,7 +8,7 @@
 FROM debian as spotify_intersect
 WORKDIR /srv/spotify_intersect
 #COPY --from=build /app/target/release/spotify_intersect ./
-RUN apt-get update && apt-get -y install libssl-dev
+RUN apt-get update && apt-get -y install libssl-dev ca-certificates
 COPY ./target/release/spotify_intersect ./
 COPY .env /srv/spotify_intersect/.env
 COPY Rocket.toml ./
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 43af83e..0481399 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,26 +4,33 @@ services:
     image: spotify_intersect
     container_name: spotify_intersect
     ports:
-      - 8085:8085
+        - 8085:8085
     build:
       context: ..
       dockerfile: docker/Dockerfile
       #environment:
     networks:
-      - database
-      - hostnet
+        - database
+        - hostnet
     depends_on:
-      - track_db
+        - track_db
+    links: 
+        - "track_db:db"
+          #volumes:
+          #-  /etc/ssl/certs:/etc/ssl/certs:ro
         # - zookeeper
   track_db:
     image: postgres
     container_name: track_db
     networks:
-      - database
+        - database
+    ports:
+        - 5432:5432
     environment:
       POSTGRES_PASSWORD: example
 
-      volumes: ./data:/var/lib/postgresql/data
+    volumes: 
+        - ./data:/var/lib/postgresql/data
       #track_db:
       #image: noria
       # build:
-- 
cgit v1.2.3-70-g09d2