diff --git a/.github/workflows/deploy-manually.yml b/.github/workflows/deploy-manually.yml index dea0b1d..cd277dd 100644 --- a/.github/workflows/deploy-manually.yml +++ b/.github/workflows/deploy-manually.yml @@ -35,9 +35,7 @@ jobs: semantic_release: runs-on: ubuntu-latest outputs: - #new_release_published: ${{ steps.semantic.outputs.last_release_version != steps.semantic.outputs.new_release_version }} new_release_published: ${{ steps.semantic.outputs.new_release_published }} - #new_release_version: ${{ steps.semantic.outputs.new_release_version }} new_release_version: ${{ (steps.semantic.outputs.new_release_published == 'true' && steps.semantic.outputs.new_release_version) || (github.event_name == 'workflow_dispatch' && '0.0.0') }} steps: - name: Checkout @@ -57,7 +55,6 @@ jobs: ] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} deploy: if: ${{ github.event_name == 'workflow_dispatch' || needs.semantic_release.outputs.new_release_published == 'true' }} @@ -107,9 +104,8 @@ jobs: ENV: ${{ needs.extract_environment.outputs.environment }} IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }} ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} run: | - docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN} + docker-compose -f build.docker-compose.yml build docker-compose -f build.docker-compose.yml push - name: Create ZIP file to Deploy AWS Beanstalk diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d51f77..8f71d05 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,8 +2,6 @@ name: Test on: pull_request: branches: - - alpha - - beta - main jobs: @@ -21,23 +19,22 @@ jobs: env: ENV: test IMAGE_TAG: test - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} run: | export ENV=test export IMAGE_TAG=test export ACCOUNT_ID=test - docker-compose -f build.docker-compose.yml build --build-arg NPM_TOKEN=${NPM_TOKEN} + docker-compose -f build.docker-compose.yml build - name: Run Test env: ENV: test IMAGE_TAG: test ACCOUNT_ID: test - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + APP_NAME: ${{ github.event.repository.name }} run: | export ENV=test export IMAGE_TAG=test - docker-compose -f build.docker-compose.yml run -e NPM_TOKEN=${NPM_TOKEN} --rm --entrypoint="npm run test" maestro + docker-compose -f build.docker-compose.yml run --rm --entrypoint="npm run test" $APP_NAME - name: Remove Docker's Trash if: always() diff --git a/.npmrc b/.npmrc deleted file mode 100644 index bd3327a..0000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -//registry.npmjs.org/:_authToken=${NPM_TOKEN} \ No newline at end of file diff --git a/.releaserc.json b/.releaserc.json index 4f6d6b7..e526302 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -26,7 +26,6 @@ "preset": "eslint" } ], - "@semantic-release/npm", "@semantic-release/github" ] } diff --git a/Dockerfile b/Dockerfile index 0c77cb1..ba242b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,16 @@ FROM node:18.3.0-alpine3.15 as packages WORKDIR /packages -ARG NPM_TOKEN COPY package.json . COPY package-lock.json . -COPY .npmrc . +RUN apk update \ + && apk add --no-cache aws-cli \ + && aws codeartifact login --tool npm --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1 \ + && npm install -RUN apk update && apk add curl unzip -RUN apk add --no-cache aws-cli - -RUN aws codeartifact login --tool npm --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1 - -RUN npm install -RUN rm -f ./.npmrc - -FROM node:14.15.4-alpine3.12 +FROM node:18.3.0-alpine3.15 WORKDIR /app COPY . /app/ -ARG NPM_TOKEN COPY --from=packages /packages/node_modules /app/node_modules RUN npm run build EXPOSE 3333 -ENTRYPOINT npm run start \ No newline at end of file +ENTRYPOINT npm run start