Skip to content

Commit

Permalink
feat: add logstash image (#53)
Browse files Browse the repository at this point in the history
* feat: add logstash directories and amend CI/CD workflows

* feat: added logstash dockerfile

* fix: hadolint errors

* fix: remove apt update

* fix: test root user

* fix: setting final user

* fix: use correct versions

* fix: versions again

* fix: formatting

* feat: add lables with description and install sinatra v4.1.0

* fix: hadolint error

* fix: typo

* fix: sinatra build in layer

* fix: sinatra build hadolint error

* fix: sinatra build hadolint error

* fix: hadolint error on ruby install

* fix: stripping out sinatra update breaks everything

---------

Co-authored-by: laurence.barker@dvsa.gov.uk <laurence.barker@dvsa.gov.uk>
  • Loading branch information
Wi11Shell and barkerl authored Dec 17, 2024
1 parent c8552a9 commit dd63dc3
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@ jobs:
- php/8.3/fpm-nginx
- php/8.2/cli
- php/8.3/cli
- logstash/8.16.0/batch
exclude:
- base: ${{ github.event_name == 'schedule' || needs.release-please.outputs.release_created || contains(needs.orchestrator.outputs.changed-directories, 'php/8.2/fpm-nginx') && 'ignored' || 'php/8.2/fpm-nginx' }}
- base: ${{ github.event_name == 'schedule' || needs.release-please.outputs.release_created || contains(needs.orchestrator.outputs.changed-directories, 'php/8.2/fpm-apache') && 'ignored' || 'php/8.2/fpm-apache' }}
- base: ${{ github.event_name == 'schedule' || needs.release-please.outputs.release_created || contains(needs.orchestrator.outputs.changed-directories, 'php/8.3/fpm-nginx') && 'ignored' || 'php/8.3/fpm-nginx' }}
- base: ${{ github.event_name == 'schedule' || needs.release-please.outputs.release_created || contains(needs.orchestrator.outputs.changed-directories, 'php/8.2/cli') && 'ignored' || 'php/8.2/cli' }}
- base: ${{ github.event_name == 'schedule' || needs.release-please.outputs.release_created || contains(needs.orchestrator.outputs.changed-directories, 'php/8.3/cli') && 'ignored' || 'php/8.3/cli' }}
- base: ${{ github.event_name == 'schedule' || needs.release-please.outputs.release_created || contains(needs.orchestrator.outputs.changed-directories, 'logstash/8.16.0/batch') && 'ignored' || 'logstash/8.16.0/batch' }}
uses: ./.github/workflows/docker.yaml
with:
image-version: ${{ (needs.release-please.outputs.release_created || github.event_name == 'schedule') && needs.release-please.outputs.tag_name || github.sha }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ jobs:
- php/8.3/fpm-nginx
- php/8.2/cli
- php/8.3/cli
- logstash/8.16.0/batch
exclude:
- base: ${{ contains(needs.orchestrator.outputs.changed-directories, 'php/8.2/fpm-nginx') && 'ignored' || 'php/8.2/fpm-nginx' }}
- base: ${{ contains(needs.orchestrator.outputs.changed-directories, 'php/8.2/fpm-apache') && 'ignored' || 'php/8.2/fpm-apache' }}
- base: ${{ contains(needs.orchestrator.outputs.changed-directories, 'php/8.3/fpm-nginx') && 'ignored' || 'php/8.3/fpm-nginx' }}
- base: ${{ contains(needs.orchestrator.outputs.changed-directories, 'php/8.2/cli') && 'ignored' || 'php/8.2/cli' }}
- base: ${{ contains(needs.orchestrator.outputs.changed-directories, 'php/8.3/cli') && 'ignored' || 'php/8.3/cli' }}
- base: ${{ contains(needs.orchestrator.outputs.changed-directories, 'logstash/8.16.0/batch') && 'ignored' || 'logstash/8.16.0/batch' }}
uses: ./.github/workflows/docker.yaml
with:
image-version: ${{ github.event.pull_request.head.sha }}
Expand Down
15 changes: 15 additions & 0 deletions logstash/8.16.0/batch/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM logstash:8.16.0

LABEL version="1.0"
LABEL description="Dockerfile with logstash with Sinatra and MySQL client for VOL"

USER root

RUN apt-get update && \
apt-get -y --no-install-recommends install \
curl=7.68.0-1ubuntu2.24 \
default-mysql-client=1.0.5ubuntu2 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

USER 1000

0 comments on commit dd63dc3

Please sign in to comment.