Merge pull request #42 from jkaninda/develop

Refactoring
This commit is contained in:
2023-01-09 05:54:33 +02:00
committed by GitHub
9 changed files with 87 additions and 15 deletions

View File

@@ -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"

75
.github/workflows/manual.yaml vendored Normal file
View File

@@ -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"

View File

@@ -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 /

View File

@@ -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 /

View File

@@ -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 /

View File

@@ -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 /

View File

@@ -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 /

View File

@@ -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 /