Skip to content

Commit

Permalink
Merge branch '1.10'
Browse files Browse the repository at this point in the history
* 1.10:
  Backport master changes on docker to 1.10
  Update python package name in nodejs step
  Upgrade to GitHub-native Dependabot
  • Loading branch information
windragon0910 committed Dec 30, 2021
2 parents 93748d7 + 46833ab commit 86f7a34
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 7 deletions.
34 changes: 34 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
version: 2
updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: stripe/stripe-php
versions:
- 7.69.0
- 7.70.0
- 7.72.0
- 7.73.0
- 7.74.0
- 7.75.0
- 7.76.0
- dependency-name: sylius-labs/coding-standard
versions:
- 4.0.1
- dependency-name: sylius/sylius
versions:
- 1.9.0
- dependency-name: phpstan/phpstan
versions:
- 0.12.70
- 0.12.71
- 0.12.73
- dependency-name: phpstan/phpstan-webmozart-assert
versions:
- 0.12.10
- 0.12.11
- 0.12.9
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ FROM node:${NODE_VERSION}-alpine AS sylius_node
WORKDIR /srv/sylius

RUN set -eux; \
apk add --no-cache --virtual .build-deps \
g++ \
gcc \
git \
make \
python \
;
apk add --no-cache --virtual .build-deps \
g++ \
gcc \
git \
make \
python2 \
;

# prevent the reinstallation of vendors at every changes in the source code
COPY package.json yarn.lock ./
Expand Down

0 comments on commit 86f7a34

Please sign in to comment.