Merge pull request #9 from sundowndev/feat/docker

Docker setup
pull/10/head
Raphael 2019-10-30 10:47:04 +01:00 committed by GitHub
commit 10da6b656b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 54 deletions

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
.DS_Store
node_modules
/dist
dist
coverage
/tests/e2e/videos/

View File

@ -8,6 +8,6 @@ RUN npm run build
# production stage
FROM nginx:stable-alpine as production-stage
COPY --from=build-stage /app/public /usr/share/nginx/html
COPY --from=build-stage /app/dist /usr/share/nginx/html
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>HETIC vs EEMI</title>
</head>
<body>
<noscript>
<strong>We're sorry but api-directory doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>

View File

@ -1,20 +0,0 @@
{
"name": "api-directory",
"short_name": "api-directory",
"icons": [
{
"src": "./img/icons/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "./img/icons/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"start_url": "./index.html",
"display": "standalone",
"background_color": "#000000",
"theme_color": "#4DBA87"
}

View File

@ -1,2 +0,0 @@
User-agent: *
Disallow:

View File

@ -9,7 +9,7 @@ export default new Router({
base: process.env.BASE_URL,
routes: [
{
path: '*',
path: '/',
name: 'home',
component: Home,
},

View File

@ -5,7 +5,7 @@ services:
container_name: hve_client
restart: on-failure
build:
context: .
context: ./client
dockerfile: ./Dockerfile
volumes:
- ./client/nginx.conf:/etc/nginx/conf.d/default.conf:ro
@ -13,7 +13,9 @@ services:
- NODE_ENV=production
networks:
- default
- web
#- web
ports:
- 8080:80
command: ['nginx', '-g', 'daemon off;']
# labels:
# - 'traefik.docker.network=web'
@ -36,19 +38,17 @@ services:
restart: on-failure
image: node:8
build:
context: .
dockerfile: ./server/Dockerfile
env_file:
- .env
context: ./server
dockerfile: ./Dockerfile
environment:
- NODE_ENV=production
ports:
- '3000:3000'
networks:
- default
- postgres
command: ['node', '/api/server/index.js']
#- web
command: ['node', 'index.js']
networks:
web:
external: true
#networks:
# web:
# external: true

View File

@ -4,7 +4,7 @@ WORKDIR /api
COPY ./package-lock.json .
COPY ./package.json .
COPY ./server ./server
COPY . .
# Build
RUN npm install --prefix /api