diff --git a/Dockerfile b/Dockerfile index 62040095e..5cd2fde64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM node:12-slim AS client +ENV NODE_ENV production WORKDIR /client COPY ./client/ ./ RUN npm install @@ -10,9 +11,12 @@ COPY ./server ./ #RUN go build -o uno . RUN env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o uno . +FROM alpine:latest as certs +RUN apk --update add ca-certificates + FROM scratch WORKDIR /uno COPY --from=server /server/uno /uno/uno COPY --from=client /client/dist /client/dist -RUN apk add --no-cache ca-certificates +COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt CMD ["/uno/uno"] \ No newline at end of file diff --git a/client/package.json b/client/package.json index c777a9f04..8b313712e 100644 --- a/client/package.json +++ b/client/package.json @@ -11,24 +11,24 @@ "test-integration": "cypress run --browser chrome" }, "dependencies": { - "@types/jest": "^26.0.3", - "@vue/cli-service-global": "^4.4.6", - "axios": "^0.19.2", - "core-js": "^3.6.4", - "vue": "^2.6.11", - "vue-router": "^3.1.6", - "vuetify": "^2.2.11" + "@types/jest": "^26.0.3", + "@vue/cli-service": "~4.3.0", + "@vue/cli-plugin-unit-jest": "^4.4.6", + "@vue/cli-service-global": "^4.4.6", + "@vue/cli-plugin-eslint": "~4.3.0", + "eslint-plugin-jest": "^23.17.1", + "axios": "^0.19.2", + "core-js": "^3.6.4", + "vue": "^2.6.11", + "vue-router": "^3.1.6", + "vuetify": "^2.2.11" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.3.0", - "@vue/cli-plugin-eslint": "~4.3.0", "@vue/cli-plugin-router": "~4.3.0", - "@vue/cli-plugin-unit-jest": "^4.4.6", - "@vue/cli-service": "~4.3.0", "babel-eslint": "^10.1.0", "cypress": "^4.9.0", "eslint": "^6.7.2", - "eslint-plugin-jest": "^23.17.1", "eslint-plugin-vue": "^6.2.2", "sass": "^1.19.0", "sass-loader": "^8.0.0",