diff --git a/.github/workflows/ci-dockerhub-multiarch.yml b/.github/workflows/ci-dockerhub-multiarch.yml new file mode 100644 index 0000000..8345d42 --- /dev/null +++ b/.github/workflows/ci-dockerhub-multiarch.yml @@ -0,0 +1,39 @@ +# amd64 only: +# docker buildx build --push --platform linux/amd64 --tag xxx/xxx:latest . +# multiplatform: +# docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64,linux/386 --tag xxx/xxx:latest . +name: ci-dockerhub-multiarch + +on: + push: + tags: + - v* + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v3 + with: + context: . + file: Dockerfile.multiarch + platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/386 + push: true + tags: filegator/filegator:latest-multiarch, filegator/filegator:${{ github.ref_name }}-multiarch diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch index 8dae6a4..d89d160 100644 --- a/Dockerfile.multiarch +++ b/Dockerfile.multiarch @@ -1,9 +1,9 @@ ################################################ -# simpler build, no ldap, sftp, s3... +# simpler build from static files, no ldap, sftp, s3... # build and deploy to docker hub with: # docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64,linux/386 --tag filegator/filegator:vX.X.X-multiarch - < Dockerfile.multiarch ################################################ -FROM php:7-apache-buster +FROM php:8.3-apache-bullseye RUN apt-get update > /dev/null RUN apt-get install -y git libzip-dev wget unzip diff --git a/docs/development.md b/docs/development.md index 24b5007..d5bd1da 100644 --- a/docs/development.md +++ b/docs/development.md @@ -15,7 +15,7 @@ See `docker-compose-dev.yml` for more informations about configurations and depe ## Project setup for development (Linux) -You must have `git`, `php`, `node (v14)`, `npm`, and `composer` installed. +You must have `git`, `php`, `node`, `npm`, and `composer` installed. ``` git clone https://github.com/filegator/filegator.git diff --git a/package.json b/package.json index 00b0418..2a45a16 100644 --- a/package.json +++ b/package.json @@ -42,4 +42,4 @@ "vue-template-compiler": "^2.6.11", "vuex": "^3.4.0" } -} +} \ No newline at end of file