cd: refactory cd (#234)

pagarme · Aug 21, 2023 · 6b104b4 · 6b104b4
1 parent ce0da0b
commit 6b104b4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 118 deletions.
diff --git a/.github/data/docker-compose.yml b/.github/data/docker-compose.yml
diff --git a/.github/data/magento2_module_install.sql b/.github/data/magento2_module_install.sql
diff --git a/.github/data/php8/Dockerfile b/.github/data/php8/Dockerfile
@@ -12,7 +12,7 @@ ARG MARKETPLACE_REPO
 ARG MARKETPLACE_NAME
 ARG MARKETPLACE_VERSION
 ARG MARKETPLACE_REPO_URL
-
+RUN composer config minimum-stability dev
 RUN composer config -g http-basic.repo.magento.com ${MAGENTO_KEY} ${MAGENTO_SECRET}
 RUN composer require pagarme/pagarme-magento2-module:dev-stg
 

diff --git a/.github/data/stg/Dockerfile b/.github/data/stg/Dockerfile
@@ -12,7 +12,7 @@ ARG MARKETPLACE_REPO
 ARG MARKETPLACE_NAME
 ARG MARKETPLACE_VERSION
 ARG MARKETPLACE_REPO_URL
-
+RUN composer config minimum-stability dev
 RUN composer config -g http-basic.repo.magento.com ${MAGENTO_KEY} ${MAGENTO_SECRET}
 RUN composer require pagarme/pagarme-magento2-module:dev-stg
 

diff --git a/.github/data/wait-for-mysql.sh b/.github/data/wait-for-mysql.sh
diff --git a/.github/workflows/cd_reusable.yml b/.github/workflows/cd_reusable.yml
@@ -21,25 +21,7 @@ jobs:
     -
       name: Copy CI files to root
       run: |
-        cp .github/data/docker-compose.yml .
         cp .github/data/${{ matrix.tags }}/Dockerfile .
-        cp .github/data/wait-for-mysql.sh .
-        cp .github/data/magento2_module_install.sql .
-    -
-      name: Build image base for modifications
-      run: |
-        export MAGENTO_KEY=${{ secrets.MAGENTO_KEY }}
-        export MAGENTO_SECRET=${{ secrets.MAGENTO_SECRET }}
-        export MARKETPLACE_KEY=${{ secrets.MARKETPLACE_KEY }}
-        export MARKETPLACE_SECRET=${{ secrets.MARKETPLACE_SECRET }}
-        export MARKETPLACE_REPO=${{ secrets.MARKETPLACE_REPO }}
-        export MARKETPLACE_NAME=${{ secrets.MARKETPLACE_NAME }}
-        export MARKETPLACE_VERSION=${{ secrets.MARKETPLACE_VERSION }}
-        export MARKETPLACE_REPO_URL=${{ secrets.MARKETPLACE_REPO_URL }}
-        docker compose up -d
-    -
-      name: Activate and setup Plugin
-      run: docker ps
     -
       name: Log in to Docker Hub
       uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
@@ -57,6 +39,15 @@ jobs:
       name: Build and push Docker image
       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
       with:
+        build-args: |
+          MAGENTO_KEY=${{ secrets.MAGENTO_KEY }}
+          MAGENTO_SECRET=${{ secrets.MAGENTO_SECRET }}
+          MARKETPLACE_KEY=${{ secrets.MARKETPLACE_KEY }}
+          MARKETPLACE_SECRET=${{ secrets.MARKETPLACE_SECRET }}
+          MARKETPLACE_REPO=${{ secrets.MARKETPLACE_REPO }}
+          MARKETPLACE_NAME=${{ secrets.MARKETPLACE_NAME }}
+          MARKETPLACE_VERSION=${{ secrets.MARKETPLACE_VERSION }}
+          MARKETPLACE_REPO_URL=${{ secrets.MARKETPLACE_REPO_URL }}
         context: .
         push: true
         tags: ${{ secrets.DOCKER_ACCOUNT }}/magento2-pagarme:${{ matrix.tags }}