summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDennis Kobert <dennis@kobert.dev>2020-02-11 20:15:10 +0000
committerDennis Kobert <dennis@kobert.dev>2020-02-11 20:15:10 +0000
commit394bcfe59485b96639c35a57e67c2331cf5c434d (patch)
tree358709bdd15310c0fac353c2695e4e40852255a5 /docker
parentca3f3051a9552e372ef466f1eba36c9ea9b6c314 (diff)
Add certificates to server
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/docker-compose.yml19
2 files changed, 14 insertions, 7 deletions
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: