Merge pull request #193 from gordalina/sg/docker-ci

Docker CI
gordalina · Dec 11, 2021 · 22d7b80 · 22d7b80
2 parents dfa4ebd + a789367
commit 22d7b80
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          username: cachetool
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
@@ -145,9 +145,16 @@ jobs:
             ghcr.io/gordalina/cachetool:${{ steps.info.outputs.VERSION }}
 
       - name: Push images
-        run: docker push gordalina/cachetool:${{ steps.info.outputs.VERSION }}
+        run: |
+          docker push gordalina/cachetool:${{ steps.info.outputs.VERSION }}
           docker push ghcr.io/gordalina/cachetool:${{ steps.info.outputs.VERSION }}
 
+      - name: Push latest images
+        if: ${{ !contains(github.ref, '-') }}
+        run: |
+          docker push gordalina/cachetool:latest
+          docker push ghcr.io/gordalina/cachetool:latest
+
       - name: Create GitHub Release
         id: create_release
         uses: softprops/action-gh-release@v1
@@ -175,9 +182,3 @@ jobs:
           git config --global user.email "actions@github.com"
           git config --global user.name "GitHub Actions"
           bin/update-gh-pages.sh ${{ steps.info.outputs.VERSION }}
-
-      - name: Push latest images
-        if: ${{ !contains(github.ref, '-') }}
-        run: |
-          docker push gordalina/cachetool:latest
-          docker push ghcr.io/gordalina/cachetool:latest
diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,7 @@ ENV CACHETOOL_VERSION ${CACHETOOL_VERSION}
 
 WORKDIR /opt/cachetool
 
+RUN apk add git
 RUN wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet --install-dir=/usr/local/bin --filename=composer
 
 RUN composer global config minimum-stability dev