Skip to content

Commit

Permalink
fix update server
Browse files Browse the repository at this point in the history
  • Loading branch information
jpascal committed Apr 12, 2019
1 parent 1f6caf3 commit 8356339
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Expand Up @@ -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/
6 changes: 3 additions & 3 deletions dist.js
Expand Up @@ -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')}`)
)
]);
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -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,
Expand Down

0 comments on commit 8356339

Please sign in to comment.