Fix docker build

ptkis · Mar 28, 2024 · ce25bdc · ce25bdc
1 parent ef35165
commit ce25bdc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 38 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,44 +30,23 @@ jobs:
       - name: Install docker
         run: |
           command docker -v || curl -fsSL get.docker.com | sudo bash
-      - name: Remove Rabbit MQ
-        run: docker rm -f rabbitmq || true
-      - name: Start Rabbit MQ
-        run: docker run -d --name=rabbitmq -p 5672:5672 -e RABBITMQ_NODE_PORT=5672 ptkis/rabbitmq-federated:10-mining-amd64
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - run: echo "$APPLICATION_SECRET_PROPERTIES" > src/test/resources/application-secret.properties
-        env:
-          APPLICATION_SECRET_PROPERTIES: ${{ secrets.APPLICATION_SECRET_PROPERTIES }}
-      - name: Get FIREBASE_JSON from secrets
-        run: |
-          echo $FIREBASE_JSON > src/main/resources/banyuwangi-dashboard-firebase-adminsdk.json
-        env:
-          FIREBASE_JSON: ${{ secrets.FIREBASE_JSON }}
-      - name: Test and assemble with Gradle
-        run: ./gradlew assemble
-        env:
-          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: chmod +x deploy.sh
-      - name: Deploy to docker
-        run: ./deploy.sh
-        env:
-          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          report_paths: '**/build/test-results/test/TEST-*.xml'
-        if: always()
-      - name: Remove application-secret.properties
-        run: rm -f src/test/resources/application-secret.properties || true
-        if: always()
-      - name: Remove Rabbit MQ
-        run: docker rm -f --volumes rabbitmq || true
-        if: always()
-      - name: Upload openapi artifacts
-        uses: actions/upload-artifact@v2
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Assemble with Gradle
+        run: ./gradlew assemble
+      - name: Build docker
+        uses: docker/build-push-action@v5
         with:
-          name: openapi
-          path: build/openapi.json
+          context: .
+          file: Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}:0.0.${{ github.run_number }}
diff --git a/deploy.sh b/deploy.sh
@@ -8,7 +8,6 @@ echo Displaying content of build/libs
 find build/libs
 
 export version=0.0.$BUILD_ID
-echo "$DOCKER_HUB_PASSWORD" | docker login -u ptkis --password-stdin
 docker rmi "ptkis/$ARTIFACT:$version" || true
 docker build \
   --build-arg "ARTIFACT=$ARTIFACT" \