Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

Commit b3d10e3

Browse files
committed
removed ws and http protocol references
1 parent 87748c8 commit b3d10e3

File tree

4 files changed

+12
-24
lines changed

4 files changed

+12
-24
lines changed

Diff for: backend/scripts/ci/Dockerfile

+7-9
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ ADD backend/ /code/
1515

1616
# build stage that generates quasar assets
1717
FROM node:10-alpine as build-stage
18-
ENV HTTP_PROTOCOL http
19-
ENV WS_PROTOCOL ws
20-
ENV DOMAIN_NAME localhost:9000
18+
ENV FULL_DOMAIN_NAME localhost:9000
2119
WORKDIR /app/
2220
COPY quasar/package.json /app/
2321
RUN npm cache verify
@@ -43,9 +41,9 @@ RUN npm -v
4341

4442
# cypress dependencies
4543
RUN apt-get -qq install -y xvfb \
46-
libgtk-3-dev \
47-
libnotify-dev \
48-
libgconf-2-4 \
49-
libnss3 \
50-
libxss1 \
51-
libasound2
44+
libgtk-3-dev \
45+
libnotify-dev \
46+
libgconf-2-4 \
47+
libnss3 \
48+
libxss1 \
49+
libasound2

Diff for: compose/minikube.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
version: '3.7'
1+
version: "3.7"
22

33
services:
4-
54
frontend:
65
image: frontend:2
76
build:
87
context: ../
98
dockerfile: nginx/minikube/Dockerfile
109
args:
11-
- DOMAIN_NAME=minikube.local
10+
- FULL_DOMAIN_NAME=minikube.local
1211
- GOOGLE_OAUTH2_KEY=google123
1312
- GITHUB_KEY=github123
14-
- WS_PROTOCOL=ws
15-
- HTTP_PROTOCOL=http
1613

1714
backend:
1815
image: backend:1
1916
build:
2017
context: ../backend/
2118
dockerfile: scripts/dev/Dockerfile
22-

Diff for: documentation/docs/topics/minikube/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -775,11 +775,9 @@ services:
775775
context: ../
776776
dockerfile: nginx/minikube/Dockerfile
777777
args:
778-
- DOMAIN_NAME=minikube.local
778+
- FULL_DOMAIN_NAME=minikube.local
779779
- GOOGLE_OAUTH2_KEY=google123
780780
- GITHUB_KEY=github123
781-
- WS_PROTOCOL=ws
782-
- HTTP_PROTOCOL=http
783781
```
784782

785783
Make sure that your current shell has the correct environment variables set for the `DOCKER_HOST` by running:

Diff for: nginx/minikube/Dockerfile

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
# build stage
22
FROM node:10-alpine as build-stage
3-
ARG DOMAIN_NAME
3+
ARG FULL_DOMAIN_NAME
44
ARG GOOGLE_OAUTH2_KEY
55
ARG GITHUB_KEY
6-
ARG WS_PROTOCOL
7-
ARG HTTP_PROTOCOL
86

9-
ENV DOMAIN_NAME=${DOMAIN_NAME}
7+
ENV FULL_DOMAIN_NAME=${DOMAIN_NAME}
108
ENV GOOGLE_OAUTH2_KEY=${GOOGLE_OAUTH2_KEY}
119
ENV GITHUB_KEY=${GITHUB_KEY}
12-
ENV WS_PROTOCOL=${WS_PROTOCOL}
13-
ENV HTTP_PROTOCOL=${HTTP_PROTOCOL}
1410

1511
WORKDIR /app/
1612
COPY quasar/package.json /app/

0 commit comments

Comments
 (0)