diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4e09af..9e3e307 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,45 +26,42 @@ jobs: name: Build and push 7.2 uses: docker/build-push-action@v3 with: - file: "./docker/7.2/Dockerfile" + file: "./src/docker/7.2/Dockerfile" push: true tags: "${{env.BUILDKIT_IMAGE}}:7.2" - name: Build and push 7.3 uses: docker/build-push-action@v3 with: - file: "./docker/7.3/Dockerfile" + file: "./src/docker/7.3/Dockerfile" push: true tags: "${{env.BUILDKIT_IMAGE}}:7.3" - name: Build and push 7.4 uses: docker/build-push-action@v3 with: - file: "./docker/7.4/Dockerfile" + file: "./src/docker/7.4/Dockerfile" push: true tags: "${{env.BUILDKIT_IMAGE}}:7.4" - name: Build and push 8.0 uses: docker/build-push-action@v3 with: - file: "./docker/8.0/Dockerfile" - platforms: linux/amd64,linux/arm64 + file: "./src/docker/8.0/Dockerfile" push: true tags: "${{env.BUILDKIT_IMAGE}}:8.0" - name: Build and push 8.1 uses: docker/build-push-action@v3 with: - file: "./docker/8.1/Dockerfile" - platforms: linux/amd64,linux/arm64 + file: "./src/docker/8.1/Dockerfile" push: true tags: "${{env.BUILDKIT_IMAGE}}:8.1" - name: Build and push 8.2 uses: docker/build-push-action@v3 with: - file: "./docker/8.2/Dockerfile" - platforms: linux/amd64,linux/arm64 + file: "./src/docker/8.2/Dockerfile" push: true tags: | "${{env.BUILDKIT_IMAGE}}:8.2" diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml new file mode 100644 index 0000000..2949100 --- /dev/null +++ b/.github/workflows/manual.yaml @@ -0,0 +1,75 @@ +name: Build-manually +on: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + inputs: + docker_tag: + description: 'Docker tag' + required: true + default: 'latest' + type: string +env: + BUILDKIT_IMAGE: jkaninda/laravel-php-fpm +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push 7.2 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.2/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.2" + - + name: Build and push 7.3 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.3/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.3" + - + name: Build and push 7.4 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/7.4/Dockerfile" + push: true + tags: "${{env.BUILDKIT_IMAGE}}:7.4" + - + name: Build and push 8.0 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.0/Dockerfile" + #platforms: linux/amd64,linux/arm64 + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.0" + - + name: Build and push 8.1 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.1/Dockerfile" + #platforms: linux/amd64,linux/arm64 + push: true + tags: "${{env.BUILDKIT_IMAGE}}:8.1" + - + name: Build and push 8.2 + uses: docker/build-push-action@v3 + with: + file: "./src/docker/8.2/Dockerfile" + platforms: linux/amd64,linux/arm64 + push: true + tags: | + "${{env.BUILDKIT_IMAGE}}:8.2" + "${{env.BUILDKIT_IMAGE}}:latest" \ No newline at end of file diff --git a/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile similarity index 98% rename from docker/7.2/Dockerfile rename to src/docker/7.2/Dockerfile index 09b6127..d8f0b5e 100644 --- a/docker/7.2/Dockerfile +++ b/src/docker/7.2/Dockerfile @@ -74,7 +74,7 @@ ADD src/index.php $WORKDIR/index.php ADD src/php.ini $PHP_INI_DIR/conf.d/ ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf -COPY ./entrypoint.sh /usr/local/bin/ +COPY src/entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh RUN ln -s /usr/local/bin/entrypoint.sh / diff --git a/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile similarity index 98% rename from docker/7.3/Dockerfile rename to src/docker/7.3/Dockerfile index 8678cd7..7586755 100644 --- a/docker/7.3/Dockerfile +++ b/src/docker/7.3/Dockerfile @@ -74,7 +74,7 @@ ADD src/index.php $WORKDIR/index.php ADD src/php.ini $PHP_INI_DIR/conf.d/ ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf -COPY ./entrypoint.sh /usr/local/bin/ +COPY src/entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh RUN ln -s /usr/local/bin/entrypoint.sh / diff --git a/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile similarity index 98% rename from docker/7.4/Dockerfile rename to src/docker/7.4/Dockerfile index 06ea974..58ba3a2 100644 --- a/docker/7.4/Dockerfile +++ b/src/docker/7.4/Dockerfile @@ -76,7 +76,7 @@ ADD src/index.php $WORKDIR/index.php ADD src/php.ini $PHP_INI_DIR/conf.d/ ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf -COPY ./entrypoint.sh /usr/local/bin/ +COPY src/entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh RUN ln -s /usr/local/bin/entrypoint.sh / diff --git a/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile similarity index 98% rename from docker/8.0/Dockerfile rename to src/docker/8.0/Dockerfile index 862b394..8063238 100644 --- a/docker/8.0/Dockerfile +++ b/src/docker/8.0/Dockerfile @@ -76,7 +76,7 @@ ADD src/index.php $WORKDIR/index.php ADD src/php.ini $PHP_INI_DIR/conf.d/ ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf -COPY ./entrypoint.sh /usr/local/bin/ +COPY src/entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh RUN ln -s /usr/local/bin/entrypoint.sh / diff --git a/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile similarity index 98% rename from docker/8.1/Dockerfile rename to src/docker/8.1/Dockerfile index a1f8223..a5416c3 100644 --- a/docker/8.1/Dockerfile +++ b/src/docker/8.1/Dockerfile @@ -76,7 +76,7 @@ ADD src/index.php $WORKDIR/index.php ADD src/php.ini $PHP_INI_DIR/conf.d/ ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf -COPY ./entrypoint.sh /usr/local/bin/ +COPY src/entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh RUN ln -s /usr/local/bin/entrypoint.sh / diff --git a/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile similarity index 98% rename from docker/8.2/Dockerfile rename to src/docker/8.2/Dockerfile index f6463b9..f225d5f 100644 --- a/docker/8.2/Dockerfile +++ b/src/docker/8.2/Dockerfile @@ -76,7 +76,7 @@ ADD src/index.php $WORKDIR/index.php ADD src/php.ini $PHP_INI_DIR/conf.d/ ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf -COPY ./entrypoint.sh /usr/local/bin/ +COPY src/entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh RUN ln -s /usr/local/bin/entrypoint.sh / diff --git a/entrypoint.sh b/src/entrypoint.sh similarity index 100% rename from entrypoint.sh rename to src/entrypoint.sh