From efc684952da2d55cd4ba7eb2656e71ecdd18074c Mon Sep 17 00:00:00 2001
From: gatici <gulsum.atici@canonical.com>
Date: Wed, 17 Jan 2024 11:25:35 +0300
Subject: [PATCH] Arrange github workflows

Signed-off-by: gatici <gulsum.atici@canonical.com>
---
 .github/workflows/master.yml  | 6 +++---
 mongoapi/dbtestapp/Dockerfile | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 851b3d8..08f1453 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -35,11 +35,10 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
-      - name: Build and push Docker image
+      - name: Build Docker image
         run: |
           cd mongoapi/dbtestapp
           make docker-build
-          make docker-push
 
   build:
     runs-on: ubuntu-latest
@@ -67,7 +66,8 @@ jobs:
         uses: golangci/golangci-lint-action@v3.7.0
         with:
           version: latest
-          args: -v --config ./.golangci.yml
+          args: -v --config ../../.golangci.yml
+          working-directory: ./mongoapi/dbtestapp
 
   license-check:
     runs-on: ubuntu-latest
diff --git a/mongoapi/dbtestapp/Dockerfile b/mongoapi/dbtestapp/Dockerfile
index 6c0ca73..a845c77 100644
--- a/mongoapi/dbtestapp/Dockerfile
+++ b/mongoapi/dbtestapp/Dockerfile
@@ -4,15 +4,15 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-FROM golang:1.21.3-bookworm AS test
+FROM golang:1.21.6-bookworm AS test
 
 LABEL maintainer="ONF <omec-dev@opennetworking.org>"
 
 RUN apt-get update && apt-get -y install vim 
 
-RUN cd $GOPATH/src && mkdir -p dbtestapp
-COPY . $GOPATH/src/dbtestapp
-RUN cd $GOPATH/src/dbtestapp && go install
+WORKDIR $GOPATH/src/dbtestapp
+COPY . .
+RUN go install
 
 FROM alpine:3.16 AS dbtestapp
 RUN apk update && apk add -U gcompat vim strace net-tools curl netcat-openbsd bind-tools bash