Merge pull request #13 from jkaninda/develop

Refactoring

.github/workflows/build-manual.yml

@@ -0,0 +1,72 @@
+name: Manual-build
+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/nginx-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"
+          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"
+          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"
+          push: true
+          tags: |
+           "${{env.BUILDKIT_IMAGE}}:8.2"
+           "${{env.BUILDKIT_IMAGE}}:latest"

.github/workflows/build.yml

@@ -26,42 +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"
+          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"
+          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"
+          file: "./src/docker/8.2/Dockerfile"
           push: true
           tags: |
            "${{env.BUILDKIT_IMAGE}}:8.2"

build.sh

@@ -8,9 +8,9 @@ fi
 if [ $tag != 'latest' ]
 then
   echo 'Build from tag'
-  docker build -f docker/${tag}/Dockerfile -t jkaninda/nginx-php-fpm:$tag .
+  docker build -f src/docker/${tag}/Dockerfile -t jkaninda/nginx-php-fpm:$tag .
 else
  echo 'Build latest'
- docker build -f docker/8.2/Dockerfile -t jkaninda/nginx-php-fpm:$tag .
+ docker build -f src/docker/8.2/Dockerfile -t jkaninda/nginx-php-fpm:$tag .
  
 fi

src/docker/7.2/Dockerfile

@@ -70,7 +70,7 @@ ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 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 /
 

src/docker/7.3/Dockerfile

@@ -70,7 +70,7 @@ ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 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 /
 

src/docker/7.4/Dockerfile

@@ -70,7 +70,7 @@ ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 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 /
 

src/docker/8.0/Dockerfile

@@ -82,7 +82,7 @@ ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 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 /
 

src/docker/8.1/Dockerfile

@@ -82,7 +82,7 @@ ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 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 /
 

src/docker/8.2/Dockerfile

@@ -82,7 +82,7 @@ ADD src/conf/nginx/default.conf /etc/nginx/sites-available/default
 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 /