mirror of
https://github.com/shlinkio/shlink-web-client.git
synced 2024-12-23 01:20:24 +03:00
Updated runtimne versions
This commit is contained in:
parent
91daec852f
commit
544384d85e
4 changed files with 6 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
build:
|
build:
|
||||||
environment:
|
environment:
|
||||||
node: v12.14.1
|
node: v12.16.3
|
||||||
tools:
|
tools:
|
||||||
external_code_coverage:
|
external_code_coverage:
|
||||||
timeout: 1200
|
timeout: 1200
|
||||||
|
|
|
@ -6,12 +6,12 @@ jobs:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
- name: "Docker publish"
|
- name: "Docker publish"
|
||||||
node_js: '12.14.1'
|
node_js: '12.16.3'
|
||||||
if: NOT type = pull_request
|
if: NOT type = pull_request
|
||||||
env:
|
env:
|
||||||
- DOCKER_PUBLISH="true"
|
- DOCKER_PUBLISH="true"
|
||||||
- name: "CI"
|
- name: "CI"
|
||||||
node_js: '12.14.1'
|
node_js: '12.16.3'
|
||||||
env:
|
env:
|
||||||
- DOCKER_PUBLISH="false"
|
- DOCKER_PUBLISH="false"
|
||||||
allow_failures:
|
allow_failures:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:12.14.1-alpine as node
|
FROM node:12.16.3-alpine as node
|
||||||
COPY . /shlink-web-client
|
COPY . /shlink-web-client
|
||||||
ARG VERSION="latest"
|
ARG VERSION="latest"
|
||||||
ENV VERSION ${VERSION}
|
ENV VERSION ${VERSION}
|
||||||
|
@ -10,7 +10,7 @@ RUN cd /shlink-web-client && \
|
||||||
# If no dist file exsts, build from scratch
|
# If no dist file exsts, build from scratch
|
||||||
if [[ ! -f ${DIST_FILE} ]]; then npm install && npm run build -- ${VERSION} --no-dist ; fi
|
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 <alejandro@alejandrocelaya.com>"
|
LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
|
||||||
RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
|
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
|
COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
|
|
|
@ -3,7 +3,7 @@ version: '3'
|
||||||
services:
|
services:
|
||||||
shlink_web_client_node:
|
shlink_web_client_node:
|
||||||
container_name: 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"
|
command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/home/shlink/www
|
- ./:/home/shlink/www
|
||||||
|
|
Loading…
Reference in a new issue