Skip to content

Commit 562742d

Browse files
authored
chore: add memcached + docker-cli to dev container (ietf-tools#3691)
1 parent 74d3052 commit 562742d

3 files changed

Lines changed: 20 additions & 0 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
"containerEnv": {
1111
"EDITOR_VSCODE": "true"
1212
},
13+
14+
"features": {
15+
"docker-in-docker": {
16+
"version": "latest"
17+
},
18+
"github-cli": "latest"
19+
},
1320

1421
// Set *default* container specific settings.json values on container create.
1522
"settings": {

docker/app.Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ EXPOSE 8000
1313

1414
ENV DEBIAN_FRONTEND=noninteractive
1515

16+
# Add Docker Source
17+
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
18+
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
19+
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
20+
1621
RUN apt-get update
1722

1823
# apt-get upgrade is normally not a good idea, but this is a dev container
@@ -26,6 +31,7 @@ RUN apt-get install -qy \
2631
bash \
2732
build-essential \
2833
curl \
34+
docker-ce-cli \
2935
enscript \
3036
fish \
3137
gawk \
@@ -48,9 +54,11 @@ RUN apt-get install -qy \
4854
libxtst6 \
4955
libmagic-dev \
5056
libmariadb-dev \
57+
libmemcached-tools \
5158
libtidy-dev \
5259
locales \
5360
mariadb-client \
61+
memcached \
5462
netcat \
5563
nano \
5664
pigz \

docker/scripts/app-init.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,16 @@ for sub in \
8484
done
8585

8686
# Wait for DB container
87+
8788
if [ -n "$EDITOR_VSCODE" ]; then
8889
echo "Waiting for DB container to come online ..."
8990
/usr/local/bin/wait-for localhost:3306 -- echo "DB ready"
9091
fi
9192

93+
# Run memcached
94+
95+
/usr/bin/memcached -u root -d
96+
9297
# Initial checks
9398

9499
echo "Running initial checks..."

0 commit comments

Comments
 (0)