Skip to content

Commit d3d07b2

Browse files
jerry-goodmanjerry-goodman
committed
Merge branch 'feat_0114' into 'develop'
update dockerfile for node service See merge request taco/openblocks-oss!10
2 parents 71e6203 + 0f69f6d commit d3d07b2

File tree

5 files changed

+22
-32
lines changed

5 files changed

+22
-32
lines changed

‎deploy/docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ RUN echo "deb [ arch=amd64,arm64 ]http://repo.mongodb.org/apt/ubuntu focal/mongo
3939
&& apt-get remove wget -y
4040

4141
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
42-
&& apt-get -y install --no-install-recommends -y mongodb-org=4.4.6 redis \
42+
&& apt-get -y install --no-install-recommends -y mongodb-org=4.4.6 redis nodejs \
4343
&& apt-get clean \
4444
&& rm -rf /var/lib/apt/lists/*
4545

46+
RUN npm install -g yarn
47+
4648
# Clean up cache file - Service layer
4749
RUN rm -rf \
4850
/root/.cache \
@@ -58,6 +60,7 @@ RUN rm -rf \
5860
VOLUME [ "/openblocks-stacks" ]
5961

6062
ENV OPENBLOCKS_SERVER_PROXY_PASS http://localhost:8080
63+
ENV OPENBLOCKS_NODE_PROXY_PASS http://localhost:6060
6164

6265
# copy jre
6366
COPY --from=jre-build /build/jre /app

‎deploy/docker/entrypoint.sh

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
set -e
44

5-
init_mongodb() {
6-
echo "Init mongoDB"
7-
MONGO_DB_PATH="/openblocks-stacks/data/mongodb"
8-
mkdir -p "$MONGO_DB_PATH"
5+
init_directory() {
6+
# Create sub-directory to store services log in the container mounting folder
7+
mkdir -p /openblocks-stacks/logs/backend
8+
mkdir -p /openblocks-stacks/logs/frontend
9+
mkdir -p /openblocks-stacks/logs/mongodb
10+
mkdir -p /openblocks-stacks/logs/redis
11+
mkdir -p /openblocks-stacks/logs/node
12+
mkdir -p /openblocks-stacks/data/redis
13+
mkdir -p /openblocks-stacks/data/mongodb
914
}
1015

1116
init_configuration() {
@@ -31,14 +36,8 @@ add_user() {
3136
chown $USER_ID:$GROUP_ID /run
3237
}
3338

34-
init_mongodb
39+
init_directory
3540
init_configuration
36-
# Create sub-directory to store services log in the container mounting folder
37-
mkdir -p /openblocks-stacks/logs/backend
38-
mkdir -p /openblocks-stacks/logs/frontend
39-
mkdir -p /openblocks-stacks/logs/redis
40-
mkdir -p /openblocks-stacks/data/redis
41-
4241
add_user
4342

4443
# Handle CMD command

‎deploy/docker/scripts/start-nginx.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ cp /openblocks/nginx/nginx-root.conf.template /etc/nginx/nginx.conf
99

1010
if [ -e "/openblocks-stacks/ssl/fullchain.pem" ] && [ -e "/openblocks-stacks/ssl/privkey.pem" ];
1111
then
12-
envsubst '$OPENBLOCKS_SERVER_PROXY_PASS' < /openblocks/nginx/nginx-app-https.conf.template > /etc/nginx/conf.d/default.conf
12+
envsubst '$OPENBLOCKS_SERVER_PROXY_PASS,$OPENBLOCKS_NODE_PROXY_PASS' < /openblocks/nginx/nginx-app-https.conf.template > /etc/nginx/conf.d/default.conf
1313
else
14-
envsubst '$OPENBLOCKS_SERVER_PROXY_PASS' < /openblocks/nginx/nginx-app-http.conf.template > /etc/nginx/conf.d/default.conf
14+
envsubst '$OPENBLOCKS_SERVER_PROXY_PASS,$OPENBLOCKS_NODE_PROXY_PASS' < /openblocks/nginx/nginx-app-http.conf.template > /etc/nginx/conf.d/default.conf
1515
fi
1616

1717
exec nginx -g 'daemon off;'

‎deploy/docker/templates/nginx/nginx-app-http.conf.template

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ server {
33
root /openblocks/client;
44
location / {
55
try_files $uri /index.html;
6-
76
if ($request_filename ~* .*.(html|htm)$) {
87
add_header Cache-Control no-cache;
98
}
@@ -13,14 +12,9 @@ server {
1312
proxy_set_header X-Forwarded-Host $host;
1413
proxy_pass ${OPENBLOCKS_SERVER_PROXY_PASS};
1514
}
16-
location /oauth2 {
17-
proxy_set_header X-Forwarded-Proto $scheme;
18-
proxy_set_header X-Forwarded-Host $host;
19-
proxy_pass ${OPENBLOCKS_SERVER_PROXY_PASS};
20-
}
21-
location /login {
22-
proxy_set_header X-Forwarded-Proto $scheme;
23-
proxy_set_header X-Forwarded-Host $host;
24-
proxy_pass ${OPENBLOCKS_SERVER_PROXY_PASS};
15+
location /node-service/plugin-icons {
16+
proxy_set_header X-Forwarded-Proto $scheme;
17+
proxy_set_header X-Forwarded-Host $host;
18+
proxy_pass ${OPENBLOCKS_NODE_PROXY_PASS};
2519
}
2620
}

‎deploy/docker/templates/nginx/nginx-app-https.conf.template

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ server {
66
root /openblocks/client;
77
location / {
88
try_files $uri /index.html;
9-
109
if ($request_filename ~* .*.(html|htm)$) {
1110
add_header Cache-Control no-cache;
1211
}
@@ -16,15 +15,10 @@ server {
1615
proxy_set_header X-Forwarded-Host $host;
1716
proxy_pass ${OPENBLOCKS_SERVER_PROXY_PASS};
1817
}
19-
location /oauth2 {
20-
proxy_set_header X-Forwarded-Proto $scheme;
21-
proxy_set_header X-Forwarded-Host $host;
22-
proxy_pass ${OPENBLOCKS_SERVER_PROXY_PASS};
23-
}
24-
location /login {
18+
location /node-service/plugin-icons {
2519
proxy_set_header X-Forwarded-Proto $scheme;
2620
proxy_set_header X-Forwarded-Host $host;
27-
proxy_pass ${OPENBLOCKS_SERVER_PROXY_PASS};
21+
proxy_pass ${OPENBLOCKS_NODE_PROXY_PASS};
2822
}
2923
}
3024

0 commit comments

Comments
 (0)