Skip to content

Commit

Permalink
Merge c4d5557 into 695ec55
Browse files Browse the repository at this point in the history
  • Loading branch information
SmetDenis committed Mar 23, 2024
2 parents 695ec55 + c4d5557 commit 5752d2e
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 202 deletions.
31 changes: 29 additions & 2 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ name: Publish Docker

on:
push:
branches:
- "**"
tags:
- 'v*.*.*'
pull_request:
branches:
- 'master'

Expand All @@ -24,13 +29,33 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Docker Meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
jbzoo/csv-blueprint
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Available platforms
run: echo ${{ steps.buildx.outputs.platforms }} && docker version

- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
Expand All @@ -40,5 +65,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: jbzoo/csv-blueprint:latest
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/mips64le, linux/mips64, linux/arm/v7, linux/arm/v6
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
COPY . /app
RUN cd /app \
&& composer install --no-dev \
--classmap-authoritative \
--no-progress \
&& composer clear-cache \
&& chmod +x /app/csv-blueprint
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ demo-docker: ##@Project Run demo via Docker
$(call title,"Demo - Valid CSV \(via Docker\)")
@docker run --rm \
-v `pwd`:/parent-host \
jbzoo/csv-blueprint \
jbzoo/csv-blueprint-local \
validate:csv \
--csv=/parent-host/tests/fixtures/demo.csv \
--schema=/parent-host/tests/schemas/demo_valid.yml \
--ansi -vvv
$(call title,"Demo - Invalid CSV \(via Docker\)")
@docker run --rm \
-v `pwd`:/parent-host \
jbzoo/csv-blueprint \
jbzoo/csv-blueprint-local \
validate:csv \
--csv=/parent-host/tests/fixtures/demo.csv \
--schema=/parent-host/tests/schemas/demo_invalid.yml \
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
"symfony/filesystem" : ">=6.4.3",
"symfony/finder" : ">=6.4.0",
"markrogoyski/math-php" : "^2.9.0",
"respect/validation" : "^2.3.5",

"classpreloader/classpreloader" : "^4.2",
"classpreloader/console" : "^3.2"
"respect/validation" : "^2.3.5"
},

"require-dev" : {
Expand Down
251 changes: 57 additions & 194 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5752d2e

Please sign in to comment.