Skip to content

Commit cfc301d

Browse files
committed
ci: add docker-cli to base test image
1 parent 9df659b commit cfc301d

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

dev/docker-test-base/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,28 @@ LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
33

44
ENV DEBIAN_FRONTEND=noninteractive
55

6+
67
RUN apt-get update
78
RUN apt-get -qy upgrade
89

910
# Add Node.js Source
1011
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
1112

13+
# Add Docker Source
14+
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
15+
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
16+
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
17+
1218
# Install the packages we need
19+
RUN apt-get update
1320
RUN apt-get install -qy \
1421
apache2-utils \
1522
apt-file \
1623
apt-utils \
1724
bash \
1825
build-essential \
1926
curl \
27+
docker-ce-cli \
2028
enscript \
2129
gawk \
2230
gcc \
@@ -105,16 +113,11 @@ RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
105113
ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
106114
RUN chmod +rx /usr/local/bin/wait-for
107115

108-
# Copy the startup file
109-
COPY docker/scripts/app-init.sh /docker-init.sh
110-
RUN sed -i 's/\r$//' /docker-init.sh && \
111-
chmod +x /docker-init.sh
112-
113116
# Create workspace
114117
RUN mkdir -p /workspace
115118
WORKDIR /workspace
116119

117120
# Install NPM modules
118121
COPY package.json package.json
119122
RUN npm install --no-audit
120-
RUN rm -f package.json package-lock.json
123+
RUN rm -f package.json package-lock.json

0 commit comments

Comments
 (0)