Skip to content

Commit

Permalink
Merge pull request typecho#41 from lufei/make
Browse files Browse the repository at this point in the history
Fix missing change make script
  • Loading branch information
joyqi authored Mar 24, 2024
2 parents 740aa45 + 8815cc2 commit 4c177fa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Quick reference

* Maintained by: [Typecho Dev Team](https://github.com/typecho)
* Where to get help: [the Typecho Docker Github issues](https://github.com/typecho/Dockerfile/issues)
* Where to get help: [the Typecho Docker GitHub issues](https://github.com/typecho/Dockerfile/issues)

# Supported tags and respective `Dockerfile` links

* [nightly-php7.3, nightly-php7.3-cli, nightly-php7.3-fpm, nightly-php7.3-apache, nightly-php7.4, nightly-php7.4-cli, nightly-php7.4-fpm, nightly-php7.4-apache, nightly-php8.0, nightly-php8.0-cli, nightly-php8.0-fpm, nightly-php8.0-apache, nightly-php7.3-alpine, nightly-php7.3-cli-alpine, nightly-php7.3-fpm-alpine, nightly-php7.4-alpine, nightly-php7.4-cli-alpine, nightly-php7.4-fpm-alpine, nightly-php8.0-alpine, nightly-php8.0-cli-alpine, nightly-php8.0-fpm-alpine](https://github.com/typecho/Dockerfile)
* [nightly-php7.4, nightly-php7.4-cli, nightly-php7.4-fpm, nightly-php7.4-apache, nightly-php8.2, nightly-php8.2-cli, nightly-php8.2-fpm, nightly-php8.2-apache, nightly-php7.4-alpine, nightly-php7.4-cli-alpine, nightly-php7.4-fpm-alpine, nightly-php8.2-alpine, nightly-php8.2-cli-alpine, nightly-php8.2-fpm-alpine](https://github.com/typecho/Dockerfile)

# How to use this image

Expand Down
14 changes: 8 additions & 6 deletions make-workflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,25 @@ EOF)
runs-on: ubuntu-latest
${needs}
steps:
- name: Checkout the repo
uses: actions/checkout@v2
- name: Checkout the repo
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: \${{ secrets.DOCKERHUB_USERNAME }}
password: \${{ secrets.DOCKERHUB_TOKEN }}
- name: Generate Dockerfile
id: generate
run: |
./build.sh -g -v \${{ github.event.inputs.version }} -p ${p} -o ${o} ${f}
env:
dockerhub_username: \${{ secrets.DOCKERHUB_USERNAME }}
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
platforms: \${{ steps.generate.outputs.PLATFORM }}
Expand Down

0 comments on commit 4c177fa

Please sign in to comment.