Skip to content

Commit c94265d

Browse files
authored
Dev env tweaks (#414)
- Allow specifying the profile to build via `BENCHBASE_PROFILE` environment variable (e.g., as specified in the `.env` file in the devcontainer) for better IDE integration. - Include ripgrep (`rg`) in the devcontainer.
1 parent e1bcd9e commit c94265d

File tree

2 files changed

+55
-1
lines changed

2 files changed

+55
-1
lines changed

docker/benchbase/devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
88
# Also add a few nice cli tools.
99
RUN apt-get update \
1010
&& apt-get -y upgrade \
11-
&& apt-get -y install --no-install-recommends sudo vim-nox neovim less bash-completion colordiff git openssh-client jq \
11+
&& apt-get -y install --no-install-recommends sudo vim-nox neovim less bash-completion colordiff git openssh-client jq ripgrep \
1212
&& apt-get clean && rm -rf /var/lib/apt/lists/*
1313

1414
# Add a containeruser that allows vscode/codespaces to map the local host user

pom.xml

+54
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@
5151
<profiles>
5252
<profile>
5353
<id>sqlite</id>
54+
<activation>
55+
<property>
56+
<name>env.BENCHBASE_PROFILE</name>
57+
<value>sqlite</value>
58+
</property>
59+
</activation>
5460
<properties>
5561
<classifier>sqlite</classifier>
5662
</properties>
@@ -64,6 +70,12 @@
6470
</profile>
6571
<profile>
6672
<id>postgres</id>
73+
<activation>
74+
<property>
75+
<name>env.BENCHBASE_PROFILE</name>
76+
<value>postgres</value>
77+
</property>
78+
</activation>
6779
<properties>
6880
<classifier>postgres</classifier>
6981
</properties>
@@ -77,6 +89,12 @@
7789
</profile>
7890
<profile>
7991
<id>mysql</id>
92+
<activation>
93+
<property>
94+
<name>env.BENCHBASE_PROFILE</name>
95+
<value>mysql</value>
96+
</property>
97+
</activation>
8098
<properties>
8199
<classifier>mysql</classifier>
82100
</properties>
@@ -91,6 +109,12 @@
91109
<!-- Oracle DB driver needed in profile compilation -->
92110
<profile>
93111
<id>oracle</id>
112+
<activation>
113+
<property>
114+
<name>env.BENCHBASE_PROFILE</name>
115+
<value>oracle</value>
116+
</property>
117+
</activation>
94118
<properties>
95119
<classifier>oracle</classifier>
96120
</properties>
@@ -106,6 +130,12 @@
106130
</profile>
107131
<profile>
108132
<id>mariadb</id>
133+
<activation>
134+
<property>
135+
<name>env.BENCHBASE_PROFILE</name>
136+
<value>mariadb</value>
137+
</property>
138+
</activation>
109139
<properties>
110140
<classifier>mariadb</classifier>
111141
</properties>
@@ -119,6 +149,12 @@
119149
</profile>
120150
<profile>
121151
<id>spanner</id>
152+
<activation>
153+
<property>
154+
<name>env.BENCHBASE_PROFILE</name>
155+
<value>spanner</value>
156+
</property>
157+
</activation>
122158
<properties>
123159
<classifier>spanner</classifier>
124160
</properties>
@@ -132,6 +168,12 @@
132168
</profile>
133169
<profile>
134170
<id>cockroachdb</id>
171+
<activation>
172+
<property>
173+
<name>env.BENCHBASE_PROFILE</name>
174+
<value>cockroachdb</value>
175+
</property>
176+
</activation>
135177
<properties>
136178
<classifier>cockroachdb</classifier>
137179
</properties>
@@ -145,6 +187,12 @@
145187
</profile>
146188
<profile>
147189
<id>phoenix</id>
190+
<activation>
191+
<property>
192+
<name>env.BENCHBASE_PROFILE</name>
193+
<value>phoenix</value>
194+
</property>
195+
</activation>
148196
<properties>
149197
<classifier>phoenix</classifier>
150198
</properties>
@@ -158,6 +206,12 @@
158206
</profile>
159207
<profile>
160208
<id>sqlserver</id>
209+
<activation>
210+
<property>
211+
<name>env.BENCHBASE_PROFILE</name>
212+
<value>sqlserver</value>
213+
</property>
214+
</activation>
161215
<properties>
162216
<classifier>sqlserver</classifier>
163217
</properties>

0 commit comments

Comments
 (0)