From 09cff9fa15e7c06b5599de8f7393330bd18fc61e Mon Sep 17 00:00:00 2001
From: Arthur Simas <arthursimas1@gmail.com>
Date: Mon, 1 Aug 2022 11:42:24 -0300
Subject: [PATCH] CI: cleanup ci tests

---
 .github/workflows/test.yml | 18 +++---------------
 Dockerfile                 | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8f71d05..4193f15 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,30 +11,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install Docker Compose
-        run: |
-          python3 -m pip install docker-compose --upgrade
-
       - name: Build
         env:
-          ENV: test
-          IMAGE_TAG: test
+          APP_NAME: ${{ github.event.repository.name }}
         run: |
-          export ENV=test
-          export IMAGE_TAG=test
-          export ACCOUNT_ID=test
-          docker-compose -f build.docker-compose.yml build
+          docker build -t $APP_NAME --target test .
 
       - name: Run Test
         env:
           ENV: test
-          IMAGE_TAG: test
-          ACCOUNT_ID: test
           APP_NAME: ${{ github.event.repository.name }}
         run: |
-          export ENV=test
-          export IMAGE_TAG=test
-          docker-compose -f build.docker-compose.yml run --rm --entrypoint="npm run test" $APP_NAME
+          docker run --rm --entrypoint="npm" $APP_NAME run test
 
       - name: Remove Docker's Trash
         if: always()
diff --git a/Dockerfile b/Dockerfile
index f3151dc..d1f3182 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,21 @@
+# install all dependencies
 FROM node:18.3.0-alpine3.15 as packages
-WORKDIR /packages
-COPY package.json .
-COPY package-lock.json .
-RUN apk update \
- && apk add --no-cache aws-cli \
- && aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1 \
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN apk add --no-cache aws-cli \
+ && aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 \
  && npm install
 
+# unit test specific build
+FROM node:18.3.0-alpine3.15 as test
+WORKDIR /app
+COPY --from=packages /app/node_modules ./node_modules
+COPY . ./
+
 FROM node:18.3.0-alpine3.15
 WORKDIR /app
 COPY . /app/
-COPY --from=packages /packages/node_modules /app/node_modules
+COPY --from=packages /app/node_modules ./node_modules
 RUN npm run build
 EXPOSE 3333
 ENTRYPOINT npm run start