diff --git a/.scrutinizer.yml b/.scrutinizer.yml index e7caa7ac..c78907be 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,6 +1,6 @@ build: environment: - node: v12.14.1 + node: v12.16.3 tools: external_code_coverage: timeout: 1200 diff --git a/.travis.yml b/.travis.yml index 6b6be159..c22e2261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,12 @@ jobs: fast_finish: true include: - name: "Docker publish" - node_js: '12.14.1' + node_js: '12.16.3' if: NOT type = pull_request env: - DOCKER_PUBLISH="true" - name: "CI" - node_js: '12.14.1' + node_js: '12.16.3' env: - DOCKER_PUBLISH="false" allow_failures: diff --git a/Dockerfile b/Dockerfile index a3ec3090..7c2adc9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.14.1-alpine as node +FROM node:12.16.3-alpine as node COPY . /shlink-web-client ARG VERSION="latest" ENV VERSION ${VERSION} @@ -10,7 +10,7 @@ RUN cd /shlink-web-client && \ # If no dist file exsts, build from scratch if [[ ! -f ${DIST_FILE} ]]; then npm install && npm run build -- ${VERSION} --no-dist ; fi -FROM nginx:1.17.7-alpine +FROM nginx:1.17.10-alpine LABEL maintainer="Alejandro Celaya " RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/docker-compose.yml b/docker-compose.yml index 47f8cbfe..301104b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: shlink_web_client_node: container_name: shlink_web_client_node - image: node:12.14.1-alpine + image: node:12.16.3-alpine command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start" volumes: - ./:/home/shlink/www