Merge pull request #690 from acelaya-forks/feature/fix-docker-build

Updated react-copy-to-clipboard
This commit is contained in:
Alejandro Celaya 2022-07-19 18:48:54 +02:00 committed by GitHub
commit aa14a17ad6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 35 deletions

View file

@ -19,7 +19,7 @@ jobs:
node-version: 16.15 node-version: 16.15
- name: Build - name: Build
run: | run: |
npm ci && \ npm ci --force && \
node ./scripts/set-homepage.js /shlink-web-client/${GITHUB_HEAD_REF#refs/heads/} && \ node ./scripts/set-homepage.js /shlink-web-client/${GITHUB_HEAD_REF#refs/heads/} && \
rm src/service-worker.ts && \ rm src/service-worker.ts && \
npm run build npm run build

View file

@ -16,7 +16,7 @@ jobs:
with: with:
node-version: 16.15 node-version: 16.15
- name: Generate release assets - name: Generate release assets
run: npm ci && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist run: npm ci --force && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist
- name: Publish release with assets - name: Publish release with assets
uses: docker://antonyurchenko/git-release:latest uses: docker://antonyurchenko/git-release:latest
env: env:

View file

@ -2,7 +2,7 @@ FROM node:16.15-alpine as node
COPY . /shlink-web-client COPY . /shlink-web-client
ARG VERSION="latest" ARG VERSION="latest"
ENV VERSION ${VERSION} ENV VERSION ${VERSION}
RUN cd /shlink-web-client && npm ci && NODE_ENV=production npm run build RUN cd /shlink-web-client && npm ci --force && NODE_ENV=production npm run build
FROM nginx:1.21-alpine FROM nginx:1.21-alpine
LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>" LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"

58
package-lock.json generated
View file

@ -29,14 +29,14 @@
"react": "^18.1.0", "react": "^18.1.0",
"react-chartjs-2": "^4.1.0", "react-chartjs-2": "^4.1.0",
"react-colorful": "^5.5.1", "react-colorful": "^5.5.1",
"react-copy-to-clipboard": "^5.0.4", "react-copy-to-clipboard": "^5.1.0",
"react-datepicker": "^4.7.0", "react-datepicker": "^4.8.0",
"react-dom": "^18.1.0", "react-dom": "^18.1.0",
"react-external-link": "^2.0.0", "react-external-link": "^2.0.0",
"react-leaflet": "^4.0.0", "react-leaflet": "^4.0.0",
"react-redux": "^8.0.0", "react-redux": "^8.0.0",
"react-router-dom": "^6.3.0", "react-router-dom": "^6.3.0",
"react-swipeable": "^6.2.0", "react-swipeable": "^7.0.0",
"react-tag-autocomplete": "^6.3.0", "react-tag-autocomplete": "^6.3.0",
"reactstrap": "^9.0.1", "reactstrap": "^9.0.1",
"redux": "^4.2.0", "redux": "^4.2.0",
@ -19314,21 +19314,21 @@
} }
}, },
"node_modules/react-copy-to-clipboard": { "node_modules/react-copy-to-clipboard": {
"version": "5.0.4", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz", "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
"integrity": "sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ==", "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
"dependencies": { "dependencies": {
"copy-to-clipboard": "^3", "copy-to-clipboard": "^3.3.1",
"prop-types": "^15.5.8" "prop-types": "^15.8.1"
}, },
"peerDependencies": { "peerDependencies": {
"react": "^15.3.0 || ^16.0.0 || ^17.0.0" "react": "^15.3.0 || 16 || 17 || 18"
} }
}, },
"node_modules/react-datepicker": { "node_modules/react-datepicker": {
"version": "4.7.0", "version": "4.8.0",
"resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.7.0.tgz", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.8.0.tgz",
"integrity": "sha512-FS8KgbwqpxmJBv/bUdA42MYqYZa+fEYcpc746DZiHvVE2nhjrW/dg7c5B5fIUuI8gZET6FOzuDgezNcj568Czw==", "integrity": "sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==",
"dependencies": { "dependencies": {
"@popperjs/core": "^2.9.2", "@popperjs/core": "^2.9.2",
"classnames": "^2.2.6", "classnames": "^2.2.6",
@ -19338,8 +19338,8 @@
"react-popper": "^2.2.5" "react-popper": "^2.2.5"
}, },
"peerDependencies": { "peerDependencies": {
"react": "^16.9.0 || ^17", "react": "^16.9.0 || ^17 || ^18",
"react-dom": "^16.9.0 || ^17" "react-dom": "^16.9.0 || ^17 || ^18"
} }
}, },
"node_modules/react-datepicker/node_modules/react-onclickoutside": { "node_modules/react-datepicker/node_modules/react-onclickoutside": {
@ -22130,11 +22130,11 @@
} }
}, },
"node_modules/react-swipeable": { "node_modules/react-swipeable": {
"version": "6.2.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-6.2.0.tgz", "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.0.tgz",
"integrity": "sha512-nWQ8dEM8e/uswZLSIkXUsAnQmnX4MTcryOHBQIQYRMJFDpgDBSiVbKsz/BZVCIScF4NtJh16oyxwaNOepR6xSw==", "integrity": "sha512-NI7KGfQ6gwNFN0Hor3vytYW3iRfMMaivGEuxcADOOfBCx/kqwXE8IfHFxEcxSUkxCYf38COLKYd9EMYZghqaUA==",
"peerDependencies": { "peerDependencies": {
"react": "^16.8.3 || ^17" "react": "^16.8.3 || ^17 || ^18"
} }
}, },
"node_modules/react-tag-autocomplete": { "node_modules/react-tag-autocomplete": {
@ -40758,18 +40758,18 @@
"requires": {} "requires": {}
}, },
"react-copy-to-clipboard": { "react-copy-to-clipboard": {
"version": "5.0.4", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz", "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
"integrity": "sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ==", "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
"requires": { "requires": {
"copy-to-clipboard": "^3", "copy-to-clipboard": "^3.3.1",
"prop-types": "^15.5.8" "prop-types": "^15.8.1"
} }
}, },
"react-datepicker": { "react-datepicker": {
"version": "4.7.0", "version": "4.8.0",
"resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.7.0.tgz", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.8.0.tgz",
"integrity": "sha512-FS8KgbwqpxmJBv/bUdA42MYqYZa+fEYcpc746DZiHvVE2nhjrW/dg7c5B5fIUuI8gZET6FOzuDgezNcj568Czw==", "integrity": "sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==",
"requires": { "requires": {
"@popperjs/core": "^2.9.2", "@popperjs/core": "^2.9.2",
"classnames": "^2.2.6", "classnames": "^2.2.6",
@ -42726,9 +42726,9 @@
} }
}, },
"react-swipeable": { "react-swipeable": {
"version": "6.2.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-6.2.0.tgz", "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.0.tgz",
"integrity": "sha512-nWQ8dEM8e/uswZLSIkXUsAnQmnX4MTcryOHBQIQYRMJFDpgDBSiVbKsz/BZVCIScF4NtJh16oyxwaNOepR6xSw==", "integrity": "sha512-NI7KGfQ6gwNFN0Hor3vytYW3iRfMMaivGEuxcADOOfBCx/kqwXE8IfHFxEcxSUkxCYf38COLKYd9EMYZghqaUA==",
"requires": {} "requires": {}
}, },
"react-tag-autocomplete": { "react-tag-autocomplete": {

View file

@ -45,14 +45,14 @@
"react": "^18.1.0", "react": "^18.1.0",
"react-chartjs-2": "^4.1.0", "react-chartjs-2": "^4.1.0",
"react-colorful": "^5.5.1", "react-colorful": "^5.5.1",
"react-copy-to-clipboard": "^5.0.4", "react-copy-to-clipboard": "^5.1.0",
"react-datepicker": "^4.7.0", "react-datepicker": "^4.8.0",
"react-dom": "^18.1.0", "react-dom": "^18.1.0",
"react-external-link": "^2.0.0", "react-external-link": "^2.0.0",
"react-leaflet": "^4.0.0", "react-leaflet": "^4.0.0",
"react-redux": "^8.0.0", "react-redux": "^8.0.0",
"react-router-dom": "^6.3.0", "react-router-dom": "^6.3.0",
"react-swipeable": "^6.2.0", "react-swipeable": "^7.0.0",
"react-tag-autocomplete": "^6.3.0", "react-tag-autocomplete": "^6.3.0",
"reactstrap": "^9.0.1", "reactstrap": "^9.0.1",
"redux": "^4.2.0", "redux": "^4.2.0",