From 9970ace6de838a682639bdf80d35ded2fa47d887 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Fri, 5 Feb 2021 19:14:10 +0100
Subject: [PATCH] fix application.yml path, remove some docker commands

---
 .github/workflows/build.yml                 | 5 +----
 docker/deployment/hangar-backend/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a00f706a..8eb71a8e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,8 +79,5 @@ jobs:
         if: github.event_name == 'push'
         run: |
           cd docker/deployment
-          docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
           docker-compose build
-          docker-compose push
-          secure-docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-          secure-docker stack deploy --with-registry-auth --compose-file=docker-compose.yml hangar_new
+          secure-docker stack deploy --compose-file=docker-compose.yml hangar_new
diff --git a/docker/deployment/hangar-backend/Dockerfile b/docker/deployment/hangar-backend/Dockerfile
index 0e1277ef..1d439fb9 100644
--- a/docker/deployment/hangar-backend/Dockerfile
+++ b/docker/deployment/hangar-backend/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:16-jdk-alpine
 WORKDIR hangar
 
 ADD target/hangar-*.jar /hangar/app.jar
-ADD docker/deployment/hangar/application.yml /hangar/application.yml
+ADD docker/deployment/hangar-backend/application.yml /hangar/application.yml
 
 ENV TERM xterm-256color