Skip to content

Commit

Permalink
PP-5889: bump dependencies for Node 12.13.1
Browse files Browse the repository at this point in the history
* appmetrics version 4.x does not compile with Node 12, bump to 5.0.5
* non-fixed dev dependencies causing an issue with peer dependencies,
fix these to let dependabot update them
  • Loading branch information
sfount committed Dec 2, 2019
1 parent 393d280 commit f9a0112
Show file tree
Hide file tree
Showing 5 changed files with 3,486 additions and 6,023 deletions.
1 change: 1 addition & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

ignored:
- DL3017
- DL3018
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node@sha256:b556d8910b851c27c5c8922eeb55d94fe6dbaf878d24bf0c9a8c32ba21cd091a

### Needed to run appmetrics and pact-mock-service
ADD sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
COPY sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
RUN ["apk", "--no-cache", "add", "ca-certificates", "python", "build-base"]
RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && apk add --no-cache glibc-2.28-r0.apk && rm -f glibc-2.28-r0.apk
###
Expand Down
2 changes: 1 addition & 1 deletion docker/build_and_test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node@sha256:b556d8910b851c27c5c8922eeb55d94fe6dbaf878d24bf0c9a8c32ba21cd091a

### Needed to run appmetrics and pact-mock-service
ADD sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
COPY sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
RUN ["apk", "--no-cache", "add", "ca-certificates", "python", "build-base", "bash", "ruby"]
RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && apk add --no-cache glibc-2.28-r0.apk && rm -f glibc-2.28-r0.apk
###
Expand Down
Loading

0 comments on commit f9a0112

Please sign in to comment.