Skip to content

Commit 6f3ffec

Browse files
committed
Add CB-Server version to run
1 parent 6022e74 commit 6f3ffec

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

docker/gorgon_couchbase/compose.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import sys
22

33
node_count = int(sys.argv[1])
4+
cb_url = sys.argv[2] if len(sys.argv) > 2 else ""
45

56
with open('compose.control.yaml', 'r') as f:
67
compose = f.read()
@@ -13,7 +14,11 @@
1314
for i in range(node_count):
1415
node = node_template.replace('NODE_IDX', str(i)).replace('NODE_FWD_PORT', str(8090 + i))
1516
if i == 0:
16-
node += ' build: ./node\n'
17+
node += ' build:\n'
18+
node += ' context: ./node\n'
19+
if cb_url:
20+
node += ' args:\n'
21+
node += f' CB_URL: "{cb_url}"\n'
1722
compose += node
1823

1924
with open('compose.yaml', 'w') as f:

docker/gorgon_couchbase/node/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,18 @@ ENV LANG=C.UTF-8
55
RUN apt-get -y update && apt-get -y install \
66
curl golang-go iptables netcat-openbsd procps python3 sudo tar unzip wget
77

8-
RUN wget https://packages.couchbase.com/releases/couchbase-release/couchbase-release-1.0-noarch.deb \
9-
&& dpkg -i couchbase-release-1.0-noarch.deb \
10-
&& rm couchbase-release-1.0-noarch.deb \
11-
&& apt-get -y update \
12-
&& apt-get -y install couchbase-server
8+
ARG CB_URL=""
9+
RUN if [ -n "$CB_URL" ]; then \
10+
wget -q --show-progress --progress=bar:force "$CB_URL" -O couchbase-server.deb \
11+
&& dpkg -i couchbase-server.deb \
12+
&& rm couchbase-server.deb; \
13+
else \
14+
wget -q --show-progress --progress=bar:force https://packages.couchbase.com/releases/couchbase-release/couchbase-release-1.0-noarch.deb \
15+
&& dpkg -i couchbase-release-1.0-noarch.deb \
16+
&& rm couchbase-release-1.0-noarch.deb \
17+
&& apt-get -y update \
18+
&& apt-get -y install couchbase-server; \
19+
fi
1320

1421
RUN mkdir /root/deps
1522
ADD deps.tgz /root/deps

0 commit comments

Comments
 (0)