From 7ca383e4614a9d687da596dce7909549cd570ffe Mon Sep 17 00:00:00 2001 From: Jack Henschel Date: Sun, 28 Nov 2021 10:49:49 +0100 Subject: [PATCH] [undo] remove other tests --- .../build-latest-container-images.yaml | 63 +----------- .../workflows/build-lts-container-images.yaml | 96 ------------------- .github/workflows/lint-dockerfiles.yaml | 24 ----- .../test-latest-container-images.yaml | 34 ------- .../workflows/test-lts-container-images.yaml | 34 ------- 5 files changed, 1 insertion(+), 250 deletions(-) delete mode 100644 .github/workflows/build-lts-container-images.yaml delete mode 100644 .github/workflows/lint-dockerfiles.yaml delete mode 100644 .github/workflows/test-latest-container-images.yaml delete mode 100644 .github/workflows/test-lts-container-images.yaml diff --git a/.github/workflows/build-latest-container-images.yaml b/.github/workflows/build-latest-container-images.yaml index 2f336d7..cab549b 100644 --- a/.github/workflows/build-latest-container-images.yaml +++ b/.github/workflows/build-latest-container-images.yaml @@ -1,30 +1,10 @@ name: Publish Latest Container Images -on: - push: - tags: - - '5.*' +on: [push, pull_request] jobs: - lint_dockerfiles: - name: Lint Dockerfile with hadolint - runs-on: ubuntu-latest - strategy: - matrix: - dockerfile: - - 5.0/apache/Dockerfile - - 5.0/fpm-alpine/Dockerfile - - 5.0/fpm/Dockerfile - steps: - - uses: actions/checkout@v2 - - uses: hadolint/hadolint-action@v1.5.0 - with: - dockerfile: ${{ matrix.dockerfile }} - ignore: DL4006 DL3008 DL3018 - push_images_to_registries: name: Push Container Images to registries runs-on: ubuntu-latest - needs: [lint_dockerfiles] environment: docker-build permissions: packages: write @@ -53,44 +33,3 @@ jobs: type=semver,pattern={{major}},suffix=-apache flavor: | latest=false - - name: 'Build and push latest Apache container images' - uses: docker/build-push-action@v2 - with: - context: 5.0/apache - push: true - tags: ${{ steps.metadata-apache.outputs.tags }} - labels: ${{ steps.metadata-apache.outputs.labels }} - - - name: 'FPM variant metadata' - id: metadata-fpm - uses: docker/metadata-action@v3 - with: - images: | - docker.io/martialblog/limesurvey - tags: | - type=semver,pattern={{version}},suffix=-fpm - type=semver,pattern={{major}},suffix=-fpm - - name: 'Build and push latest fpm container images' - uses: docker/build-push-action@v2 - with: - context: 5.0/fpm - push: true - tags: ${{ steps.metadata-fpm.outputs.tags }} - labels: ${{ steps.metadata-fpm.outputs.labels }} - - - name: 'FPM Alpine variant metadata' - id: metadata-fpm-alpine - uses: docker/metadata-action@v3 - with: - images: | - docker.io/martialblog/limesurvey - tags: | - type=semver,pattern={{version}},suffix=-fpm-alpine - type=semver,pattern={{major}},suffix=-fpm-alpine - - name: 'Build and push latest fpm-alpine container images' - uses: docker/build-push-action@v2 - with: - context: 5.0/fpm-alpine - push: true - tags: ${{ steps.metadata-fpm-alpine.outputs.tags }} - labels: ${{ steps.metadata-fpm-alpine.outputs.labels }} diff --git a/.github/workflows/build-lts-container-images.yaml b/.github/workflows/build-lts-container-images.yaml deleted file mode 100644 index 7087817..0000000 --- a/.github/workflows/build-lts-container-images.yaml +++ /dev/null @@ -1,96 +0,0 @@ -name: Publish LTS Container Images -on: - push: - tags: - - '3.*' - -jobs: - lint_dockerfiles: - name: 'Lint Dockerfile with hadolint' - runs-on: ubuntu-latest - strategy: - matrix: - dockerfile: - - 3.0/apache/Dockerfile - - 3.0/fpm-alpine/Dockerfile - - 3.0/fpm/Dockerfile - steps: - - uses: actions/checkout@v2 - - uses: hadolint/hadolint-action@v1.5.0 - with: - dockerfile: ${{ matrix.dockerfile }} - ignore: DL4006 DL3008 DL3018 - - push_images_to_registries: - name: 'Push container images to registries' - runs-on: ubuntu-latest - needs: [lint_dockerfiles] - environment: docker-build - permissions: - packages: write - contents: read - steps: - - name: 'Check out the repo' - uses: actions/checkout@v2 - - name: 'Set up Docker Buildx' - uses: docker/setup-buildx-action@v1 - with: - buildkitd-flags: --debug - - name: 'Log in to DockerHub' - if: github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_HUB_TOKEN }} - - name: 'Apache variant metadata' - id: metadata-apache - uses: docker/metadata-action@v3 - with: - images: | - docker.io/martialblog/limesurvey - tags: | - type=semver,pattern={{raw}},suffix=-apache - type=semver,pattern={{major}},suffix=-apache - flavor: | - latest=false - - name: 'Build and push LTS apache container images' - uses: docker/build-push-action@v2 - with: - context: 3.0/apache - push: true - tags: ${{ steps.metadata-apache.outputs.tags }} - labels: ${{ steps.metadata-apache.outputs.labels }} - - - name: 'FPM variant metadata' - id: metadata-fpm - uses: docker/metadata-action@v3 - with: - images: | - docker.io/martialblog/limesurvey - tags: | - type=semver,pattern={{version}},suffix=-fpm - type=semver,pattern={{major}},suffix=-fpm - - name: 'Build and push LTS fpm container images' - uses: docker/build-push-action@v2 - with: - context: 3.0/fpm - push: true - tags: ${{ steps.metadata-fpm.outputs.tags }} - labels: ${{ steps.metadata-apache.outputs.labels }} - - - name: 'FPM Alpine variant metadata' - id: metadata-fpm-alpine - uses: docker/metadata-action@v3 - with: - images: | - docker.io/martialblog/limesurvey - tags: | - type=semver,pattern={{version}},suffix=-fpm-alpine - type=semver,pattern={{major}},suffix=-fpm-alpine - - name: 'Build and push LTS fpm-alpine container images' - uses: docker/build-push-action@v2 - with: - context: 3.0/fpm-alpine - push: true - tags: ${{ steps.metadata-fpm-alpine.outputs.tags }} - labels: ${{ steps.metadata-apache.outputs.labels }} diff --git a/.github/workflows/lint-dockerfiles.yaml b/.github/workflows/lint-dockerfiles.yaml deleted file mode 100644 index 11c0d37..0000000 --- a/.github/workflows/lint-dockerfiles.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: Lint Dockerfile - -on: [push, pull_request] - -jobs: - lint: - name: Lint Dockerfile with hadolint - strategy: - matrix: - dockerfile: - - 3.0/apache/Dockerfile - - 3.0/fpm-alpine/Dockerfile - - 3.0/fpm/Dockerfile - - 5.0/apache/Dockerfile - - 5.0/fpm-alpine/Dockerfile - - 5.0/fpm/Dockerfile - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: hadolint/hadolint-action@v1.5.0 - with: - dockerfile: ${{ matrix.dockerfile }} - ignore: DL4006 DL3008 DL3018 diff --git a/.github/workflows/test-latest-container-images.yaml b/.github/workflows/test-latest-container-images.yaml deleted file mode 100644 index 4fd5e42..0000000 --- a/.github/workflows/test-latest-container-images.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: Test Latest Container Images - -on: [push, pull_request] - -jobs: - test_images: - name: Test Latest Container Images with Trivy - runs-on: ubuntu-latest - strategy: - matrix: - context: - - apache - - fpm-alpine - - fpm - steps: - - name: 'Check out the repo' - uses: actions/checkout@v2 - - - name: 'Set up Docker Buildx' - uses: docker/setup-buildx-action@v1 - - - name: 'Build Container images' - uses: docker/build-push-action@v2 - with: - context: 5.0/${{ matrix.context }} - push: false - load: true - tags: docker.io/martialblog/limesurvey:5-${{ matrix.context }} - - - name: 'Run Structure tests' - uses: plexsystems/container-structure-test-action@v0.2.0 - with: - image: docker.io/martialblog/limesurvey:5-${{ matrix.context }} - config: tests/${{ matrix.context }}-tests.yaml diff --git a/.github/workflows/test-lts-container-images.yaml b/.github/workflows/test-lts-container-images.yaml deleted file mode 100644 index b90d940..0000000 --- a/.github/workflows/test-lts-container-images.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: Test LTS Container Images - -on: [push, pull_request] - -jobs: - test_images: - name: Test LTS Container Images with Trivy - runs-on: ubuntu-latest - strategy: - matrix: - context: - - apache - - fpm-alpine - - fpm - steps: - - name: 'Check out the repo' - uses: actions/checkout@v2 - - - name: 'Set up Docker Buildx' - uses: docker/setup-buildx-action@v1 - - - name: 'Build Container images' - uses: docker/build-push-action@v2 - with: - context: 3.0/${{ matrix.context }} - push: false - load: true - tags: docker.io/martialblog/limesurvey:3-${{ matrix.context }} - - - name: 'Run Structure tests' - uses: plexsystems/container-structure-test-action@v0.2.0 - with: - image: docker.io/martialblog/limesurvey:3-${{ matrix.context }} - config: tests/${{ matrix.context }}-tests.yaml