Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove sans nginx #14

Merged
merged 4 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
version: [ '8.0', '8.1', '8.2', '8.3' ]
type: [ '', '-prod' ]

steps:
Expand All @@ -25,13 +25,6 @@ jobs:
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Build and export to Docker
uses: docker/build-push-action@v3
with:
context: ${{ matrix.version }}${{ matrix.type }}
load: true
tags: kooldev/wordpress:${{ matrix.version }}${{ matrix.type }}

- name: Build and export to Docker (nginx)
uses: docker/build-push-action@v3
with:
Expand All @@ -41,18 +34,13 @@ jobs:

- name: Test docker images PHP executable
run: |
docker run kooldev/wordpress:${{ matrix.version }}${{ matrix.type }} php -v
docker run kooldev/wordpress:${{ matrix.version }}${{ matrix.type }} wp --allow-root --version

docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} php -v
docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} wp --allow-root --version

docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v
docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} supervisord version

- name: Test docker images wordpress code
run: |
docker run kooldev/wordpress:${{ matrix.version }}${{ matrix.type }} php /kool/wordpress/index.php
docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} php /kool/wordpress/index.php

- name: Login to DockerHub
Expand All @@ -65,18 +53,8 @@ jobs:
- name: Push to Hub
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-wordpress'
run: |
docker push kooldev/wordpress:${{ matrix.version }}${{ matrix.type }}
docker push kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }}

- name: Build and push
uses: docker/build-push-action@v3
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-wordpress'
with:
context: ${{ matrix.version }}${{ matrix.type }}
platforms: linux/amd64,linux/arm64
push: true
tags: kooldev/wordpress:${{ matrix.version }}${{ matrix.type }}

- name: Build and push (nginx)
uses: docker/build-push-action@v3
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-wordpress'
Expand Down
14 changes: 0 additions & 14 deletions 7.4-prod/Dockerfile

This file was deleted.

90 changes: 0 additions & 90 deletions 7.4-prod/entrypoint

This file was deleted.

14 changes: 0 additions & 14 deletions 7.4/Dockerfile

This file was deleted.

90 changes: 0 additions & 90 deletions 7.4/entrypoint

This file was deleted.

14 changes: 0 additions & 14 deletions 8.0-prod/Dockerfile

This file was deleted.

90 changes: 0 additions & 90 deletions 8.0-prod/entrypoint

This file was deleted.

14 changes: 0 additions & 14 deletions 8.0/Dockerfile

This file was deleted.

Loading
Loading