diff --git a/Dockerfile b/Dockerfile index 6a1d7cc..f836881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,5 @@ RUN npm run dist:all # -- Release --- FROM nginx:1.15.9 +COPY --from=builder /app/nginxc.conf /etc/nginx/conf.d/default.conf COPY --from=builder /app/dist/*.* /usr/share/nginx/html/ diff --git a/dist.js b/dist.js index a161900..235bba9 100644 --- a/dist.js +++ b/dist.js @@ -115,15 +115,15 @@ const targets = (targets => { fs.writeFile(path.resolve(distFolder, './dist-info.json'), JSON.stringify(distInfo, null, 2)), // works only on UNIX systems fs.symlink( - path.resolve(distFolder, `./${distInfo.mac.fileName}`), + `./${distInfo.mac.fileName}`, path.resolve(distFolder, `./${resolveSymlinkName('mac')}`) ), fs.symlink( - path.resolve(distFolder, `./${distInfo.win.fileName}`), + `./${distInfo.win.fileName}`, path.resolve(distFolder, `./${resolveSymlinkName('win')}`) ), fs.symlink( - path.resolve(distFolder, `./${distInfo.linux.fileName}`), + `./${distInfo.linux.fileName}`, path.resolve(distFolder, `./${resolveSymlinkName('linux')}`) ) ]); diff --git a/docker-compose.yml b/docker-compose.yml index 1b7f83a..4c7f5e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: container_name: update-server volumes: - ./dist:/usr/share/nginx/html + - ./nginx.conf:/etc/nginx/conf.d/default.conf ports: - "8083:80" image: nginx diff --git a/nginx.conf b/nginx.conf index 90d4dd8..d29b13a 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,7 +1,7 @@ server { listen 80; server_name localhost; - disable_symlinks off; + disable_symlinks off; #charset koi8-r; #access_log /var/log/nginx/host.access.log main; diff --git a/package.json b/package.json index eb87a65..32bac9d 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,9 @@ } }, "symlinkName": { - "win": "${os}-latest", - "mac": "${os}-latest", - "linux": "${os}-latest" + "win": "${name}-setup-latest.${ext}", + "mac": "${name}-latest.${ext}", + "linux": "${name}-setup-latest.${ext}" }, "jest": { "clearMocks": true,