From 0a3a97242b71e646f0377b9ad1f39b05be990c56 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 17 May 2020 10:13:33 +0200 Subject: [PATCH] Simplified docker image building, as it will now be run in a different job as the dist file release --- .dockerignore | 1 + Dockerfile | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.dockerignore b/.dockerignore index 29f4e6b1..63f72310 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,3 +4,4 @@ ./node_modules ./test ./shlink-web-client.gif +./dist diff --git a/Dockerfile b/Dockerfile index 7c2adc9d..674afa8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,7 @@ COPY . /shlink-web-client ARG VERSION="latest" ENV VERSION ${VERSION} RUN cd /shlink-web-client && \ - UNCOMPRESSED="shlink-web-client_${VERSION}_dist" && \ - DIST_FILE="./dist/${UNCOMPRESSED}.zip" && \ - # If a dist file already exists, just unzip it - if [[ -f ${DIST_FILE} ]]; then unzip ${DIST_FILE} && mv ./${UNCOMPRESSED} ./build ; fi && \ - # If no dist file exsts, build from scratch - if [[ ! -f ${DIST_FILE} ]]; then npm install && npm run build -- ${VERSION} --no-dist ; fi + npm install && npm run build -- ${VERSION} --no-dist FROM nginx:1.17.10-alpine LABEL maintainer="Alejandro Celaya "