From 2fd52c2241f4a9e02e65bf7ad6bf84515743a40d Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 2 Sep 2020 11:45:24 -0700 Subject: [PATCH] small fix for deploy w/docker --- docker/deployment/docker-compose.yml | 4 ++-- docker/deployment/hangar/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/deployment/docker-compose.yml b/docker/deployment/docker-compose.yml index 8ff40e72c..134e7d21f 100644 --- a/docker/deployment/docker-compose.yml +++ b/docker/deployment/docker-compose.yml @@ -4,8 +4,8 @@ services: app: image: registry.gitlab.com/minidigger/hangar2/app:latest build: - context: .. - dockerfile: docker/hangar/Dockerfile + context: ../.. + dockerfile: docker/deployment/hangar/Dockerfile depends_on: - 'db' - 'auth' diff --git a/docker/deployment/hangar/Dockerfile b/docker/deployment/hangar/Dockerfile index a656f61a2..fabdd0f40 100644 --- a/docker/deployment/hangar/Dockerfile +++ b/docker/deployment/hangar/Dockerfile @@ -3,7 +3,7 @@ FROM openjdk:14-jdk-alpine LABEL maintainer="Yannick Lamprecht " ADD target/hangar-*.jar app.jar -ADD docker/hangar/application.yml application.yml +ADD docker/deployment/hangar/application.yml application.yml ENV TERM xterm-256color